X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2Fx86_64%2Fcodegen.h;h=4fa215d54d72f7cd4fed04f964900501a2edda81;hb=d1377204f560df4d6656f58914bc4d242193c5e0;hp=6b0fb88fc2ef3be100810093efa96b06eb255621;hpb=b25dd32301a6fc583191a95b508741ef49271442;p=cacao.git diff --git a/src/vm/jit/x86_64/codegen.h b/src/vm/jit/x86_64/codegen.h index 6b0fb88fc..4fa215d54 100644 --- a/src/vm/jit/x86_64/codegen.h +++ b/src/vm/jit/x86_64/codegen.h @@ -1,9 +1,7 @@ /* src/vm/jit/x86_64/codegen.h - code generation macros for x86_64 - Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel, - C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring, - E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, - J. Wenninger, Institut f. Computersprachen - TU Wien + Copyright (C) 1996-2005, 2006, 2007, 2008, 2009 + CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO This file is part of CACAO. @@ -36,7 +34,7 @@ #include "vm/jit/x86_64/emit.h" -#include "vm/jit/jit.h" +#include "vm/jit/jit.hpp" /* additional functions and macros to generate code ***************************/ @@ -52,34 +50,9 @@ #define ALIGNCODENOP \ do { \ - for (s1 = 0; s1 < (s4) (((ptrint) cd->mcodeptr) & 7); s1++) \ - M_NOP; \ - } while (0) - - -/* M_INTMOVE: - generates an integer-move from register a to b. - if a and b are the same int-register, no code will be generated. -*/ - -#define M_INTMOVE(reg,dreg) \ - do { \ - if ((reg) != (dreg)) { \ - M_MOV(reg, dreg); \ - } \ - } while (0) - - -/* M_FLTMOVE: - generates a floating-point-move from register a to b. - if a and b are the same float-register, no code will be generated -*/ - -#define M_FLTMOVE(reg,dreg) \ - do { \ - if ((reg) != (dreg)) { \ - M_FMOV(reg, dreg); \ - } \ + int len = (-(ptrint) cd->mcodeptr) & 7; \ + if (len) \ + emit_nop(cd, len); \ } while (0) @@ -126,16 +99,10 @@ #define PATCHER_NOPS \ do { \ - M_NOP; \ - M_NOP; \ + emit_nop(cd, 2); \ } while (0) -/* stub defines ***************************************************************/ - -#define COMPILERSTUB_CODESIZE 7 + 7 + 3 - - /* macros to create code ******************************************************/ #define M_BYTE1(a) \ @@ -159,6 +126,7 @@ #define M_IMOV_IMM(a,b) emit_movl_imm_reg(cd, (u4) (a), (b)) #define M_FMOV(a,b) emit_movq_reg_reg(cd, (a), (b)) +#define M_DMOV(a,b) M_FMOV(a,b) #define M_ILD(a,b,disp) emit_movl_membase_reg(cd, (b), (disp), (a)) #define M_LLD(a,b,disp) emit_mov_membase_reg(cd, (b), (disp), (a)) @@ -195,6 +163,7 @@ #define M_LMUL_IMM(a,b,c) emit_imul_imm_reg_reg(cd, (b), (a), (c)) #define M_IINC(a) emit_incl_reg(cd, (a)) +#define M_LINC(a) emit_incq_reg(cd, (a)) #define M_IDEC(a) emit_decl_reg(cd, (a)) #define M_ALD(a,b,disp) \ @@ -206,6 +175,7 @@ } while (0) #define M_ALD32(a,b,disp) M_LLD32(a,b,disp) +#define M_ALD_DSEG(a,disp) M_ALD(a,RIP,disp) #define M_ALD_MEM(a,disp) emit_mov_mem_reg(cd, (disp), (a)) @@ -256,6 +226,7 @@ #define M_SSEXT(a,b) emit_movswq_reg_reg(cd, (a), (b)) #define M_ISEXT(a,b) emit_movslq_reg_reg(cd, (a), (b)) +#define M_BZEXT(a,b) emit_movzbq_reg_reg(cd, (a), (b)) #define M_CZEXT(a,b) emit_movzwq_reg_reg(cd, (a), (b)) #define M_ISLL_IMM(a,b) emit_shiftl_imm_reg(cd, SHIFT_SHL, (a), (b)) @@ -273,12 +244,16 @@ #define M_LCMP_IMM(a,b) emit_alu_imm_reg(cd, ALU_CMP, (a), (b)) #define M_LCMP_IMM_MEMBASE(a,b,c) emit_alu_imm_membase(cd, ALU_CMP, (a), (b), (c)) #define M_LCMP_MEMBASE(a,b,c) emit_alu_membase_reg(cd, ALU_CMP, (a), (b), (c)) +#define M_LCMP_MEMINDEX(a,b,c,d,e) emit_alul_memindex_reg(cd, ALU_CMP, (b), (a), (c), (d), (e)) #define M_ICMP(a,b) emit_alul_reg_reg(cd, ALU_CMP, (a), (b)) #define M_ICMP_IMM(a,b) emit_alul_imm_reg(cd, ALU_CMP, (a), (b)) #define M_ICMP_IMM32(a,b) emit_alul_imm32_reg(cd, ALU_CMP, (a), (b)) #define M_ICMP_IMM_MEMBASE(a,b,c) emit_alul_imm_membase(cd, ALU_CMP, (a), (b), (c)) #define M_ICMP_MEMBASE(a,b,c) emit_alul_membase_reg(cd, ALU_CMP, (a), (b), (c)) +#define M_ICMP_MEMINDEX(a,b,c,d,e) emit_alu_memindex_reg(cd, ALU_CMP, (b), (a), (c), (d), (e)) + +#define M_ACMP(a,b) M_LCMP(a,b) #define M_BEQ(disp) emit_jcc(cd, CC_E, (disp)) #define M_BNE(disp) emit_jcc(cd, CC_NE, (disp)) @@ -292,6 +267,7 @@ #define M_BUGE(disp) emit_jcc(cd, CC_AE, (disp)) #define M_BUGT(disp) emit_jcc(cd, CC_A, (disp)) +#define M_SETE(a) emit_setcc_reg(cd, CC_E, (a)) #define M_SETNE(a) emit_setcc_reg(cd, CC_NE, (a)) #define M_SETULE(a) emit_setcc_reg(cd, CC_BE, (a)) @@ -312,6 +288,7 @@ #define M_JMP(a) emit_jmp_reg(cd, (a)) #define M_JMP_IMM(a) emit_jmp_imm(cd, (a)) +#define M_JMP_IMM2(a) emit_jmp_imm2(cd, (a)) #define M_CALL(a) emit_call_reg(cd, (a)) #define M_CALL_IMM(a) emit_call_imm(cd, (a)) #define M_RET M_BYTE1(0xc3) @@ -358,9 +335,11 @@ /* system instructions ********************************************************/ +#define M_MFENCE emit_mfence(cd) #define M_RDTSC emit_rdtsc(cd) #define M_IINC_MEMBASE(a,b) emit_incl_membase(cd, (a), (b)) +#define M_LINC_MEMBASE(a,b) emit_incq_membase(cd, (a), (b)) #define M_IADD_MEMBASE(a,b,c) emit_alul_reg_membase(cd, ALU_ADD, (a), (b), (c)) #define M_IADC_MEMBASE(a,b,c) emit_alul_reg_membase(cd, ALU_ADC, (a), (b), (c)) @@ -368,47 +347,6 @@ #define M_ISBB_MEMBASE(a,b,c) emit_alul_reg_membase(cd, ALU_SBB, (a), (b), (c)) -#if defined(ENABLE_PROFILING) - -#define PROFILE_CYCLE_START \ - do { \ - if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) { \ - M_PUSH(RAX); \ - M_PUSH(RDX); \ - \ - M_MOV_IMM(code, REG_ITMP3); \ - M_RDTSC; \ - M_ISUB_MEMBASE(RAX, REG_ITMP3, OFFSET(codeinfo, cycles)); \ - M_ISBB_MEMBASE(RDX, REG_ITMP3, OFFSET(codeinfo, cycles) + 4); \ - \ - M_POP(RDX); \ - M_POP(RAX); \ - } \ - } while (0) - -#define PROFILE_CYCLE_STOP \ - do { \ - if (JITDATA_HAS_FLAG_INSTRUMENT(jd)) { \ - M_PUSH(RAX); \ - M_PUSH(RDX); \ - \ - M_MOV_IMM(code, REG_ITMP3); \ - M_RDTSC; \ - M_IADD_MEMBASE(RAX, REG_ITMP3, OFFSET(codeinfo, cycles)); \ - M_IADC_MEMBASE(RDX, REG_ITMP3, OFFSET(codeinfo, cycles) + 4); \ - \ - M_POP(RDX); \ - M_POP(RAX); \ - } \ - } while (0) - -#else - -#define PROFILE_CYCLE_START -#define PROFILE_CYCLE_STOP - -#endif - #endif /* _CODEGEN_H */ @@ -423,4 +361,5 @@ * c-basic-offset: 4 * tab-width: 4 * End: + * vim:noexpandtab:sw=4:ts=4: */