Bug 536326 - nanojit: fix X64 asm printing problems. r=dvander.

--HG--
extra : convert_revision : dd5319f481147c1083ae32c57ce83db65eb0128c
This commit is contained in:
Nicholas Nethercote 2009-12-24 11:35:30 +11:00
parent af8581791c
commit 8d12f8e105
2 changed files with 30 additions and 30 deletions

View File

@ -493,24 +493,24 @@ namespace nanojit
void Assembler::LEARIP(R r, I32 d) { emitrm(X64_learip,r,d,(Register)0); asm_output("lea %s, %d(rip)",RQ(r),d); } void Assembler::LEARIP(R r, I32 d) { emitrm(X64_learip,r,d,(Register)0); asm_output("lea %s, %d(rip)",RQ(r),d); }
void Assembler::LEAQRM(R r1, I d, R r2) { emitrm(X64_leaqrm,r1,d,r2); asm_output("leaq %s, %d(%s)",RQ(r1),d,RQ(r2)); } void Assembler::LEAQRM(R r, I d, R b) { emitrm(X64_leaqrm,r,d,b); asm_output("leaq %s, %d(%s)",RQ(r),d,RQ(b)); }
void Assembler::MOVLRM(R r1, I d, R r2) { emitrm(X64_movlrm,r1,d,r2); asm_output("movl %s, %d(%s)",RL(r1),d,RQ(r2)); } void Assembler::MOVLRM(R r, I d, R b) { emitrm(X64_movlrm,r,d,b); asm_output("movl %s, %d(%s)",RL(r),d,RQ(b)); }
void Assembler::MOVQRM(R r1, I d, R r2) { emitrm(X64_movqrm,r1,d,r2); asm_output("movq %s, %d(%s)",RQ(r1),d,RQ(r2)); } void Assembler::MOVQRM(R r, I d, R b) { emitrm(X64_movqrm,r,d,b); asm_output("movq %s, %d(%s)",RQ(r),d,RQ(b)); }
void Assembler::MOVBMR(R r1, I d, R r2) { emitrm8(X64_movbmr,r1,d,r2); asm_output("movb %d(%s), %s",d,RQ(r1),RB(r2)); } void Assembler::MOVBMR(R r, I d, R b) { emitrm8(X64_movbmr,r,d,b); asm_output("movb %d(%s), %s",d,RQ(b),RB(r)); }
void Assembler::MOVSMR(R r1, I d, R r2) { emitprm(X64_movsmr,r1,d,r2); asm_output("movs %d(%s), %s",d,RQ(r1),RS(r2)); } void Assembler::MOVSMR(R r, I d, R b) { emitprm(X64_movsmr,r,d,b); asm_output("movs %d(%s), %s",d,RQ(b),RS(r)); }
void Assembler::MOVLMR(R r1, I d, R r2) { emitrm(X64_movlmr,r1,d,r2); asm_output("movl %d(%s), %s",d,RQ(r1),RL(r2)); } void Assembler::MOVLMR(R r, I d, R b) { emitrm(X64_movlmr,r,d,b); asm_output("movl %d(%s), %s",d,RQ(b),RL(r)); }
void Assembler::MOVQMR(R r1, I d, R r2) { emitrm(X64_movqmr,r1,d,r2); asm_output("movq %d(%s), %s",d,RQ(r1),RQ(r2)); } void Assembler::MOVQMR(R r, I d, R b) { emitrm(X64_movqmr,r,d,b); asm_output("movq %d(%s), %s",d,RQ(b),RQ(r)); }
void Assembler::MOVZX8M( R r1, I d, R r2) { emitrm_wide(X64_movzx8m, r1,d,r2); asm_output("movzxb %s, %d(%s)",RQ(r1),d,RQ(r2)); } void Assembler::MOVZX8M( R r, I d, R b) { emitrm_wide(X64_movzx8m, r,d,b); asm_output("movzxb %s, %d(%s)",RQ(r),d,RQ(b)); }
void Assembler::MOVZX16M(R r1, I d, R r2) { emitrm_wide(X64_movzx16m,r1,d,r2); asm_output("movzxs %s, %d(%s)",RQ(r1),d,RQ(r2)); } void Assembler::MOVZX16M(R r, I d, R b) { emitrm_wide(X64_movzx16m,r,d,b); asm_output("movzxs %s, %d(%s)",RQ(r),d,RQ(b)); }
void Assembler::MOVSX8M( R r1, I d, R r2) { emitrm_wide(X64_movsx8m, r1,d,r2); asm_output("movsxb %s, %d(%s)",RQ(r1),d,RQ(r2)); } void Assembler::MOVSX8M( R r, I d, R b) { emitrm_wide(X64_movsx8m, r,d,b); asm_output("movsxb %s, %d(%s)",RQ(r),d,RQ(b)); }
void Assembler::MOVSX16M(R r1, I d, R r2) { emitrm_wide(X64_movsx16m,r1,d,r2); asm_output("movsxs %s, %d(%s)",RQ(r1),d,RQ(r2)); } void Assembler::MOVSX16M(R r, I d, R b) { emitrm_wide(X64_movsx16m,r,d,b); asm_output("movsxs %s, %d(%s)",RQ(r),d,RQ(b)); }
void Assembler::MOVSDRM(R r1, I d, R r2) { emitprm(X64_movsdrm,r1,d,r2); asm_output("movsd %s, %d(%s)",RQ(r1),d,RQ(r2)); } void Assembler::MOVSDRM(R r, I d, R b) { emitprm(X64_movsdrm,r,d,b); asm_output("movsd %s, %d(%s)",RQ(r),d,RQ(b)); }
void Assembler::MOVSDMR(R r1, I d, R r2) { emitprm(X64_movsdmr,r1,d,r2); asm_output("movsd %d(%s), %s",d,RQ(r1),RQ(r2)); } void Assembler::MOVSDMR(R r, I d, R b) { emitprm(X64_movsdmr,r,d,b); asm_output("movsd %d(%s), %s",d,RQ(b),RQ(r)); }
void Assembler::MOVSSRM(R r1, I d, R r2) { emitprm(X64_movssrm,r1,d,r2); asm_output("movss %s, %d(%s)",RQ(r1),d,RQ(r2)); } void Assembler::MOVSSRM(R r, I d, R b) { emitprm(X64_movssrm,r,d,b); asm_output("movss %s, %d(%s)",RQ(r),d,RQ(b)); }
void Assembler::MOVSSMR(R r1, I d, R r2) { emitprm(X64_movssmr,r1,d,r2); asm_output("movss %d(%s), %s",d,RQ(r1),RQ(r2)); } void Assembler::MOVSSMR(R r, I d, R b) { emitprm(X64_movssmr,r,d,b); asm_output("movss %d(%s), %s",d,RQ(b),RQ(r)); }
void Assembler::JMP8( S n, NIns* t) { emit_target8(n, X64_jmp8,t); asm_output("jmp %p", t); } void Assembler::JMP8( S n, NIns* t) { emit_target8(n, X64_jmp8,t); asm_output("jmp %p", t); }

View File

@ -501,21 +501,21 @@ namespace nanojit
void IMULI(Register l, Register r, int32_t i32);\ void IMULI(Register l, Register r, int32_t i32);\
void MOVQI(Register r, uint64_t u64);\ void MOVQI(Register r, uint64_t u64);\
void LEARIP(Register r, int32_t d);\ void LEARIP(Register r, int32_t d);\
void LEAQRM(Register r1, int d, Register r2);\ void LEAQRM(Register r, int d, Register b);\
void MOVLRM(Register r1, int d, Register r2);\ void MOVLRM(Register r, int d, Register b);\
void MOVQRM(Register r1, int d, Register r2);\ void MOVQRM(Register r, int d, Register b);\
void MOVBMR(Register r1, int d, Register r2);\ void MOVBMR(Register r, int d, Register b);\
void MOVSMR(Register r1, int d, Register r2);\ void MOVSMR(Register r, int d, Register b);\
void MOVLMR(Register r1, int d, Register r2);\ void MOVLMR(Register r, int d, Register b);\
void MOVQMR(Register r1, int d, Register r2);\ void MOVQMR(Register r, int d, Register b);\
void MOVZX8M(Register r1, int d, Register r2);\ void MOVZX8M(Register r, int d, Register b);\
void MOVZX16M(Register r1, int d, Register r2);\ void MOVZX16M(Register r, int d, Register b);\
void MOVSX8M(Register r1, int d, Register r2);\ void MOVSX8M(Register r, int d, Register b);\
void MOVSX16M(Register r1, int d, Register r2);\ void MOVSX16M(Register r, int d, Register b);\
void MOVSDRM(Register r1, int d, Register r2);\ void MOVSDRM(Register r, int d, Register b);\
void MOVSDMR(Register r1, int d, Register r2);\ void MOVSDMR(Register r, int d, Register b);\
void MOVSSMR(Register r1, int d, Register r2);\ void MOVSSMR(Register r, int d, Register b);\
void MOVSSRM(Register r1, int d, Register r2);\ void MOVSSRM(Register r, int d, Register b);\
void JMP8(size_t n, NIns* t);\ void JMP8(size_t n, NIns* t);\
void JMP32(size_t n, NIns* t);\ void JMP32(size_t n, NIns* t);\
void JMPX(Register indexreg, NIns** table);\ void JMPX(Register indexreg, NIns** table);\