Signed-off-by: Pekka Enberg <penb...@cs.helsinki.fi>
---
arch/x86/emit-code.c | 12 ------------
arch/x86/include/arch/instruction.h | 1 -
arch/x86/instruction.c | 1 -
arch/x86/lir-printer.c | 7 -------
test/arch-x86/emit-code-test_32.c | 7 -------
5 files changed, 0 insertions(+), 28 deletions(-)
diff --git a/arch/x86/emit-code.c b/arch/x86/emit-code.c
index 3d2f6fe..506ca6e 100644
--- a/arch/x86/emit-code.c
+++ b/arch/x86/emit-code.c
@@ -1513,17 +1513,6 @@ static void emit_xor_membase_reg(struct buffer *buf,
emit_membase_reg(buf, 0x33, src, dest);
}
-static void __emit_xor_imm_reg(struct buffer *buf, long imm, enum machine_reg
reg)
-{
- emit_alu_imm_reg(buf, 0x06, imm, reg);
-}
-
-static void emit_xor_imm_reg(struct buffer *buf, struct operand * src,
- struct operand *dest)
-{
- __emit_xor_imm_reg(buf, src->imm, mach_reg(&dest->reg));
-}
-
static void __emit_test_membase_reg(struct buffer *buf, enum machine_reg src,
unsigned long disp, enum machine_reg dest)
{
@@ -1841,7 +1830,6 @@ struct emitter emitters[] = {
DECL_EMITTER(INSN_TEST_IMM_MEMDISP, emit_test_imm_memdisp,
TWO_OPERANDS),
DECL_EMITTER(INSN_TEST_MEMBASE_REG, emit_test_membase_reg,
TWO_OPERANDS),
DECL_EMITTER(INSN_XOR_MEMBASE_REG, emit_xor_membase_reg, TWO_OPERANDS),
- DECL_EMITTER(INSN_XOR_IMM_REG, emit_xor_imm_reg, TWO_OPERANDS),
DECL_EMITTER(INSN_XOR_REG_REG, emit_xor_reg_reg, TWO_OPERANDS),
DECL_EMITTER(INSN_XOR_XMM_REG_REG, emit_xor_xmm_reg_reg, TWO_OPERANDS),
DECL_EMITTER(INSN_XOR_64_XMM_REG_REG, emit_xor_64_xmm_reg_reg,
TWO_OPERANDS),
diff --git a/arch/x86/include/arch/instruction.h
b/arch/x86/include/arch/instruction.h
index 821037f..360be1a 100644
--- a/arch/x86/include/arch/instruction.h
+++ b/arch/x86/include/arch/instruction.h
@@ -179,7 +179,6 @@ enum insn_type {
INSN_TEST_IMM_MEMDISP,
INSN_TEST_MEMBASE_REG,
INSN_XOR_MEMBASE_REG,
- INSN_XOR_IMM_REG,
INSN_XOR_REG_REG,
INSN_XOR_XMM_REG_REG,
INSN_XOR_64_XMM_REG_REG,
diff --git a/arch/x86/instruction.c b/arch/x86/instruction.c
index 93de7cd..c2133b8 100644
--- a/arch/x86/instruction.c
+++ b/arch/x86/instruction.c
@@ -702,7 +702,6 @@ static unsigned long insn_flags[] = {
[INSN_TEST_IMM_MEMDISP] = USE_NONE | DEF_NONE,
[INSN_TEST_MEMBASE_REG] = USE_SRC | USE_DST | DEF_NONE,
[INSN_XOR_64_XMM_REG_REG] = USE_SRC | USE_DST | DEF_DST,
- [INSN_XOR_IMM_REG] = USE_SRC | USE_DST | DEF_DST,
[INSN_XOR_MEMBASE_REG] = USE_SRC | USE_DST | DEF_DST,
[INSN_XOR_REG_REG] = USE_SRC | USE_DST | DEF_DST,
[INSN_XOR_XMM_REG_REG] = USE_SRC | USE_DST | DEF_DST,
diff --git a/arch/x86/lir-printer.c b/arch/x86/lir-printer.c
index bc3f417..66a19f5 100644
--- a/arch/x86/lir-printer.c
+++ b/arch/x86/lir-printer.c
@@ -934,12 +934,6 @@ static int print_xor_membase_reg(struct string *str,
struct insn *insn)
return print_membase_reg(str, insn);
}
-static int print_xor_imm_reg(struct string *str, struct insn *insn)
-{
- print_func_name(str);
- return print_imm_reg(str, insn);
-}
-
static int print_xor_reg_reg(struct string *str, struct insn *insn)
{
print_func_name(str);
@@ -1077,7 +1071,6 @@ static print_insn_fn insn_printers[] = {
[INSN_TEST_IMM_MEMDISP] = print_test_imm_memdisp,
[INSN_TEST_MEMBASE_REG] = print_test_membase_reg,
[INSN_XOR_MEMBASE_REG] = print_xor_membase_reg,
- [INSN_XOR_IMM_REG] = print_xor_imm_reg,
[INSN_XOR_REG_REG] = print_xor_reg_reg,
[INSN_XOR_XMM_REG_REG] = print_xor_xmm_reg_reg,
[INSN_XOR_64_XMM_REG_REG] = print_xor_64_xmm_reg_reg,
diff --git a/test/arch-x86/emit-code-test_32.c
b/test/arch-x86/emit-code-test_32.c
index cda75a2..f45cd56 100644
--- a/test/arch-x86/emit-code-test_32.c
+++ b/test/arch-x86/emit-code-test_32.c
@@ -384,13 +384,6 @@ void test_emit_xor_membase_reg(void)
assert_emit_insn_6(0x33, 0x9d, 0xef, 0xbe, 0xad, 0xde,
membase_reg_insn(INSN_XOR_MEMBASE_REG, &VAR_EBP, 0xdeadbeef, &VAR_EBX));
}
-void test_emit_xor_imm_reg(void)
-{
- assert_emit_insn_3(0x83, 0xf0, 0x04, imm_reg_insn(INSN_XOR_IMM_REG,
0x04, &VAR_EAX));
- assert_emit_insn_3(0x83, 0xf3, 0x08, imm_reg_insn(INSN_XOR_IMM_REG,
0x08, &VAR_EBX));
- assert_emit_insn_6(0x81, 0xf3, 0xef, 0xbe, 0xad, 0xde,
imm_reg_insn(INSN_XOR_IMM_REG, 0xdeadbeef, &VAR_EBX));
-}
-
void test_emit_cmp_membase_reg(void)
{
assert_emit_insn_3(0x3b, 0x45, 0x08,
membase_reg_insn(INSN_CMP_MEMBASE_REG, &VAR_EBP, 0x08, &VAR_EAX));
--
1.6.0.4
------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
_______________________________________________
Jatovm-devel mailing list
Jatovm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jatovm-devel
