From 54d72fc252fcf0508f898e0e70f561f55787b8f7 Mon Sep 17 00:00:00 2001 From: twisti Date: Mon, 17 Jul 2006 11:48:38 +0000 Subject: [PATCH] * src/vm/jit/asmpart.h (asm_wrapper_patcher): Renamed to asm_patcher_wrapper. * src/vm/jit/alpha/codegen.c (codegen): Likewise. (createnativestub): Likewise. * src/vm/jit/alpha/asmpart.S (asm_wrapper_patcher): Likewise. * src/vm/jit/i386/codegen.c (codegen): Likewise. (createnativestub): Likewise. * src/vm/jit/i386/asmpart.S (asm_wrapper_patcher): Likewise. * src/vm/jit/mips/codegen.c (codegen): Likewise. (createnativestub): Likewise. * src/vm/jit/mips/asmpart.S (asm_wrapper_patcher): Likewise. * src/vm/jit/powerpc/codegen.c (codegen): Likewise. (createnativestub): Likewise. * src/vm/jit/powerpc/asmpart.S (asm_wrapper_patcher): Likewise. * src/vm/jit/powerpc64/codegen.c (codegen): Likewise. (createnativestub): Likewise. * src/vm/jit/powerpc64/asmpart.S (asm_wrapper_patcher): Likewise. * src/vm/jit/x86_64/codegen.c (codegen): Likewise. (createnativestub): Likewise. * src/vm/jit/x86_64/asmpart.S (asm_wrapper_patcher): Likewise. --- src/vm/jit/alpha/asmpart.S | 20 ++++++++++---------- src/vm/jit/alpha/codegen.c | 6 +++--- src/vm/jit/asmpart.h | 4 ++-- src/vm/jit/i386/asmpart.S | 12 ++++++------ src/vm/jit/i386/codegen.c | 8 ++++---- src/vm/jit/mips/asmpart.S | 16 ++++++++-------- src/vm/jit/mips/codegen.c | 8 ++++---- src/vm/jit/powerpc/asmpart.S | 12 ++++++------ src/vm/jit/powerpc/codegen.c | 8 ++++---- src/vm/jit/powerpc64/asmpart.S | 12 ++++++------ src/vm/jit/powerpc64/codegen.c | 8 ++++---- src/vm/jit/x86_64/asmpart.S | 12 ++++++------ src/vm/jit/x86_64/codegen.c | 8 ++++---- 13 files changed, 67 insertions(+), 67 deletions(-) diff --git a/src/vm/jit/alpha/asmpart.S b/src/vm/jit/alpha/asmpart.S index 46deb31d6..a9401db90 100644 --- a/src/vm/jit/alpha/asmpart.S +++ b/src/vm/jit/alpha/asmpart.S @@ -31,7 +31,7 @@ Christian Thalinger Edwin Steiner - $Id: asmpart.S 5094 2006-07-10 13:51:38Z twisti $ + $Id: asmpart.S 5145 2006-07-17 11:48:38Z twisti $ */ @@ -67,7 +67,7 @@ .globl asm_abstractmethoderror - .globl asm_wrapper_patcher + .globl asm_patcher_wrapper .globl asm_replacement_out .globl asm_replacement_in @@ -443,7 +443,7 @@ asm_abstractmethoderror: .end asm_abstractmethoderror -/* asm_wrapper_patcher ********************************************************* +/* asm_patcher_wrapper ********************************************************* XXX @@ -459,9 +459,9 @@ asm_abstractmethoderror: *******************************************************************************/ - .ent asm_wrapper_patcher + .ent asm_patcher_wrapper -asm_wrapper_patcher: +asm_patcher_wrapper: lda sp,-((2+12+27+4)*8)(sp) /* create stack frame */ SAVE_RETURN_REGISTERS(0) /* save 1 int/1 float return registers */ @@ -473,8 +473,8 @@ asm_wrapper_patcher: stq ra,(2+12+27+2)*8(sp) /* save method return address (for leafs) */ stq pv,(2+12+27+3)*8(sp) /* save pv of calling java function */ - br ra,L_asm_wrapper_patcher_load_gp -L_asm_wrapper_patcher_load_gp: + br ra,L_asm_patcher_wrapper_load_gp +L_asm_patcher_wrapper_load_gp: ldgp gp,0(ra) /* load gp (it's not set correctly in jit) */ lda a0,(2+12+27+4)*8(sp) /* pass SP of patcher stub */ @@ -494,20 +494,20 @@ L_asm_wrapper_patcher_load_gp: ldq pv,(2+12+27+3)*8(sp) /* restore pv of calling java function */ ldq itmp3,(0+2+12+27+4)*8(sp) /* get return value */ - bne itmp3,L_asm_wrapper_patcher_exception + bne itmp3,L_asm_patcher_wrapper_exception ldq itmp3,(5+2+12+27+4)*8(sp) /* get RA to JIT */ lda sp,(6+2+12+27+4)*8(sp) /* remove stack frame */ jmp zero,(itmp3) /* jump to new patched code */ -L_asm_wrapper_patcher_exception: +L_asm_patcher_wrapper_exception: mov itmp3,xptr /* get exception */ ldq xpc,(5+2+12+27+4)*8(sp) /* RA is xpc */ lda sp,(6+2+12+27+4)*8(sp) /* remove stack frame */ br L_asm_handle_exception - .end asm_wrapper_patcher + .end asm_patcher_wrapper /* asm_replacement_out ********************************************************* diff --git a/src/vm/jit/alpha/codegen.c b/src/vm/jit/alpha/codegen.c index e41e9ba32..950459787 100644 --- a/src/vm/jit/alpha/codegen.c +++ b/src/vm/jit/alpha/codegen.c @@ -32,7 +32,7 @@ Christian Ullrich Edwin Steiner - $Id: codegen.c 5125 2006-07-12 22:12:47Z twisti $ + $Id: codegen.c 5145 2006-07-17 11:48:38Z twisti $ */ @@ -3891,7 +3891,7 @@ gen_method: M_ALD(REG_ITMP3, REG_PV, disp); M_AST(REG_ITMP3, REG_SP, 0 * 8); - disp = dseg_addaddress(cd, asm_wrapper_patcher); + disp = dseg_addaddress(cd, asm_patcher_wrapper); M_ALD(REG_ITMP3, REG_PV, disp); M_JMP(REG_ZERO, REG_ITMP3); } @@ -4410,7 +4410,7 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd) M_ALD(REG_ITMP3, REG_PV, disp); M_AST(REG_ITMP3, REG_SP, 0 * 8); - disp = dseg_addaddress(cd, asm_wrapper_patcher); + disp = dseg_addaddress(cd, asm_patcher_wrapper); M_ALD(REG_ITMP3, REG_PV, disp); M_JMP(REG_ZERO, REG_ITMP3); } diff --git a/src/vm/jit/asmpart.h b/src/vm/jit/asmpart.h index b96010eca..9d74b0592 100644 --- a/src/vm/jit/asmpart.h +++ b/src/vm/jit/asmpart.h @@ -30,7 +30,7 @@ Changes: Christian Thalinger Edwin Steiner - $Id: asmpart.h 5053 2006-06-28 19:11:20Z twisti $ + $Id: asmpart.h 5145 2006-07-17 11:48:38Z twisti $ */ @@ -141,7 +141,7 @@ void asm_handle_nat_exception(void); void asm_abstractmethoderror(void); /* wrapper for code patching functions */ -void asm_wrapper_patcher(void); +void asm_patcher_wrapper(void); /* functions for on-stack replacement */ void asm_replacement_out(void); diff --git a/src/vm/jit/i386/asmpart.S b/src/vm/jit/i386/asmpart.S index eb47e07c4..af90df2e3 100644 --- a/src/vm/jit/i386/asmpart.S +++ b/src/vm/jit/i386/asmpart.S @@ -31,7 +31,7 @@ Changes: Joseph Wenninger Edwin Steiner - $Id: asmpart.S 5109 2006-07-11 19:17:23Z twisti $ + $Id: asmpart.S 5145 2006-07-17 11:48:38Z twisti $ */ @@ -67,7 +67,7 @@ .globl asm_abstractmethoderror - .globl asm_wrapper_patcher + .globl asm_patcher_wrapper .globl asm_replacement_out .globl asm_replacement_in @@ -453,7 +453,7 @@ asm_abstractmethoderror: jmp L_asm_handle_exception -/* asm_wrapper_patcher ********************************************************* +/* asm_patcher_wrapper ********************************************************* XXX @@ -468,7 +468,7 @@ asm_abstractmethoderror: *******************************************************************************/ -asm_wrapper_patcher: +asm_patcher_wrapper: sub $((2+4)*4),sp /* create stack frame */ mov itmp1,(0+4)*4(sp) /* save itmp1 and itmp2 */ @@ -489,11 +489,11 @@ asm_wrapper_patcher: add $((6+2+4)*4),sp /* remove stack frame, keep RA */ test itmp3,itmp3 /* exception thrown? */ - jne L_asm_wrapper_patcher_exception + jne L_asm_patcher_wrapper_exception ret /* jump to new patched code */ -L_asm_wrapper_patcher_exception: +L_asm_patcher_wrapper_exception: mov itmp3,xptr /* get exception */ pop xpc /* get and remove return address */ jmp L_asm_handle_exception diff --git a/src/vm/jit/i386/codegen.c b/src/vm/jit/i386/codegen.c index 7b9971707..743ad4193 100644 --- a/src/vm/jit/i386/codegen.c +++ b/src/vm/jit/i386/codegen.c @@ -31,7 +31,7 @@ Christian Ullrich Edwin Steiner - $Id: codegen.c 5124 2006-07-12 21:59:24Z twisti $ + $Id: codegen.c 5145 2006-07-17 11:48:38Z twisti $ */ @@ -4276,7 +4276,7 @@ gen_method: M_PUSH_IMM(pref->ref); M_PUSH_IMM(pref->patcher); - M_MOV_IMM(asm_wrapper_patcher, REG_ITMP3); + M_MOV_IMM(asm_patcher_wrapper, REG_ITMP3); M_JMP(REG_ITMP3); } } @@ -4737,14 +4737,14 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd) M_PUSH_IMM(pref->ref); M_PUSH_IMM(pref->patcher); - M_MOV_IMM(asm_wrapper_patcher, REG_ITMP3); + M_MOV_IMM(asm_patcher_wrapper, REG_ITMP3); M_JMP(REG_ITMP3); } } codegen_finish(jd); - return jd->code->entrypoint; + return code->entrypoint; } diff --git a/src/vm/jit/mips/asmpart.S b/src/vm/jit/mips/asmpart.S index dcd0dd857..85062f38b 100644 --- a/src/vm/jit/mips/asmpart.S +++ b/src/vm/jit/mips/asmpart.S @@ -29,7 +29,7 @@ Changes: Christian Thalinger Edwin Steiner - $Id: asmpart.S 5063 2006-07-02 10:42:03Z twisti $ + $Id: asmpart.S 5145 2006-07-17 11:48:38Z twisti $ */ @@ -64,7 +64,7 @@ .globl asm_abstractmethoderror - .globl asm_wrapper_patcher + .globl asm_patcher_wrapper .globl asm_replacement_out .globl asm_replacement_in @@ -474,7 +474,7 @@ asm_abstractmethoderror: b asm_handle_nat_exception -/* asm_wrapper_patcher ********************************************************* +/* asm_patcher_wrapper ********************************************************* XXX @@ -488,9 +488,9 @@ asm_abstractmethoderror: *******************************************************************************/ - .ent asm_wrapper_patcher + .ent asm_patcher_wrapper -asm_wrapper_patcher: +asm_patcher_wrapper: aaddiu sp,sp,-((2+16+22+4)*8+sizestackframeinfo) /* create stack frame */ SAVE_RETURN_REGISTERS(0) /* save 1 int/1 float return registers */ @@ -529,14 +529,14 @@ asm_wrapper_patcher: ald pv,(2+16+22+3)*8(sp) /* restore pv of calling java function */ ald itmp3,((0+2+16+22+4)*8+sizestackframeinfo)(sp) /* get return value*/ - beqz itmp3,L_asm_wrapper_patcher_exception + beqz itmp3,L_asm_patcher_wrapper_exception ald itmp3,((5+2+16+22+4)*8+sizestackframeinfo)(sp) /* get RA to JIT */ aaddiu sp,sp,((6+2+16+22+4)*8+sizestackframeinfo) /* remove stack frame */ jr itmp3 /* jump to new patched code */ -L_asm_wrapper_patcher_exception: +L_asm_patcher_wrapper_exception: ald xpc,((5+2+16+22+4)*8+sizestackframeinfo)(sp) /* RA to JIT is xpc */ aaddiu sp,sp,((6+2+16+22+4)*8+sizestackframeinfo) /* remove stack frame */ @@ -557,7 +557,7 @@ L_asm_wrapper_patcher_exception: sd zero,0(v0) /* clear the exception pointer */ b asm_handle_exception - .end asm_wrapper_patcher + .end asm_patcher_wrapper /* asm_replacement_out ********************************************************* diff --git a/src/vm/jit/mips/codegen.c b/src/vm/jit/mips/codegen.c index 06d2206f6..f23ec702f 100644 --- a/src/vm/jit/mips/codegen.c +++ b/src/vm/jit/mips/codegen.c @@ -35,7 +35,7 @@ This module generates MIPS machine code for a sequence of intermediate code commands (ICMDs). - $Id: codegen.c 5127 2006-07-13 10:26:38Z twisti $ + $Id: codegen.c 5145 2006-07-17 11:48:38Z twisti $ */ @@ -3894,7 +3894,7 @@ gen_method: M_ALD(REG_ITMP3, REG_PV, disp); M_AST(REG_ITMP3, REG_SP, 0 * 8); - disp = dseg_addaddress(cd, asm_wrapper_patcher); + disp = dseg_addaddress(cd, asm_patcher_wrapper); M_ALD(REG_ITMP3, REG_PV, disp); M_JMP(REG_ITMP3); M_NOP; @@ -4421,7 +4421,7 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd) M_ALD(REG_ITMP3, REG_PV, disp); M_AST(REG_ITMP3, REG_SP, 0 * 8); - disp = dseg_addaddress(cd, asm_wrapper_patcher); + disp = dseg_addaddress(cd, asm_patcher_wrapper); M_ALD(REG_ITMP3, REG_PV, disp); M_JMP(REG_ITMP3); M_NOP; @@ -4430,7 +4430,7 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd) codegen_finish(jd); - return jd->code->entrypoint; + return code->entrypoint; } diff --git a/src/vm/jit/powerpc/asmpart.S b/src/vm/jit/powerpc/asmpart.S index 4e32960cf..2e0d229d5 100644 --- a/src/vm/jit/powerpc/asmpart.S +++ b/src/vm/jit/powerpc/asmpart.S @@ -31,7 +31,7 @@ Changes: Christian Thalinger Edwin Steiner - $Id: asmpart.S 5084 2006-07-06 22:52:23Z twisti $ + $Id: asmpart.S 5145 2006-07-17 11:48:38Z twisti $ */ @@ -68,7 +68,7 @@ .globl asm_abstractmethoderror - .globl asm_wrapper_patcher + .globl asm_patcher_wrapper .globl asm_replacement_out .globl asm_replacement_in @@ -986,7 +986,7 @@ asm_abstractmethoderror: b L_asm_handle_nat_exception -/* asm_wrapper_patcher ********************************************************* +/* asm_patcher_wrapper ********************************************************* XXX @@ -1000,7 +1000,7 @@ asm_abstractmethoderror: *******************************************************************************/ -asm_wrapper_patcher: +asm_patcher_wrapper: mflr r0 /* get Java return address (leaf) */ stw r0,6*4(sp) /* store it in the stub stackframe */ /* keep stack 16-bytes aligned: 6+1+37 = 44 */ @@ -1113,7 +1113,7 @@ asm_wrapper_patcher: mtlr r0 mr. itmp3,itmp3 /* check for an exception */ - bne L_asm_wrapper_patcher_exception + bne L_asm_patcher_wrapper_exception /* get return address (into JIT code) */ lwz itmp3,(5+LA_WORD_SIZE+5+58)*4(sp) @@ -1124,7 +1124,7 @@ asm_wrapper_patcher: mtctr itmp3 bctr /* jump to new patched code */ -L_asm_wrapper_patcher_exception: +L_asm_patcher_wrapper_exception: mr xptr,itmp3 /* get exception */ lwz xpc,(5+LA_WORD_SIZE+5+58)*4(sp) addi sp,sp,(8+LA_WORD_SIZE+5+58)*4 diff --git a/src/vm/jit/powerpc/codegen.c b/src/vm/jit/powerpc/codegen.c index 529b640d8..182717542 100644 --- a/src/vm/jit/powerpc/codegen.c +++ b/src/vm/jit/powerpc/codegen.c @@ -31,7 +31,7 @@ Christian Ullrich Edwin Steiner - $Id: codegen.c 5129 2006-07-13 11:54:16Z twisti $ + $Id: codegen.c 5145 2006-07-17 11:48:38Z twisti $ */ @@ -3631,7 +3631,7 @@ gen_method: M_ALD(REG_ITMP3, REG_PV, disp); M_AST_INTERN(REG_ITMP3, REG_SP, 0 * 4); - disp = dseg_addaddress(cd, asm_wrapper_patcher); + disp = dseg_addaddress(cd, asm_patcher_wrapper); M_ALD(REG_ITMP3, REG_PV, disp); M_MTCTR(REG_ITMP3); M_RTS; @@ -4185,7 +4185,7 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd) M_ALD(REG_ITMP3, REG_PV, disp); M_AST(REG_ITMP3, REG_SP, 0 * 4); - disp = dseg_addaddress(cd, asm_wrapper_patcher); + disp = dseg_addaddress(cd, asm_patcher_wrapper); M_ALD(REG_ITMP3, REG_PV, disp); M_MTCTR(REG_ITMP3); M_RTS; @@ -4194,7 +4194,7 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd) codegen_finish(jd); - return jd->code->entrypoint; + return code->entrypoint; } diff --git a/src/vm/jit/powerpc64/asmpart.S b/src/vm/jit/powerpc64/asmpart.S index ae9a00fa2..040229afa 100644 --- a/src/vm/jit/powerpc64/asmpart.S +++ b/src/vm/jit/powerpc64/asmpart.S @@ -31,7 +31,7 @@ Changes: Christian Thalinger Edwin Steiner - $Id: asmpart.S 5081 2006-07-06 13:59:01Z tbfg $ + $Id: asmpart.S 5145 2006-07-17 11:48:38Z twisti $ */ @@ -68,7 +68,7 @@ .globl asm_abstractmethoderror - .globl asm_wrapper_patcher + .globl asm_patcher_wrapper .globl asm_replacement_out .globl asm_replacement_in @@ -986,7 +986,7 @@ asm_abstractmethoderror: b L_asm_handle_nat_exception -/* asm_wrapper_patcher ********************************************************* +/* asm_patcher_wrapper ********************************************************* XXX @@ -1000,7 +1000,7 @@ asm_abstractmethoderror: *******************************************************************************/ -asm_wrapper_patcher: +asm_patcher_wrapper: mflr r0 /* get Java return address (leaf) */ stw r0,6*4(sp) /* store it in the stub stackframe */ /* keep stack 16-bytes aligned: 6+1+37 = 44 */ @@ -1113,7 +1113,7 @@ asm_wrapper_patcher: mtlr r0 mr. itmp3,itmp3 /* check for an exception */ - bne L_asm_wrapper_patcher_exception + bne L_asm_patcher_wrapper_exception /* get return address (into JIT code) */ lwz itmp3,(5+LA_WORD_SIZE+5+58)*4(sp) @@ -1124,7 +1124,7 @@ asm_wrapper_patcher: mtctr itmp3 bctr /* jump to new patched code */ -L_asm_wrapper_patcher_exception: +L_asm_patcher_wrapper_exception: mr xptr,itmp3 /* get exception */ lwz xpc,(5+LA_WORD_SIZE+5+58)*4(sp) addi sp,sp,(8+LA_WORD_SIZE+5+58)*4 diff --git a/src/vm/jit/powerpc64/codegen.c b/src/vm/jit/powerpc64/codegen.c index 8e02f97c3..874b22aff 100644 --- a/src/vm/jit/powerpc64/codegen.c +++ b/src/vm/jit/powerpc64/codegen.c @@ -31,7 +31,7 @@ Christian Ullrich Edwin Steiner - $Id: codegen.c 5082 2006-07-06 14:10:23Z tbfg $ + $Id: codegen.c 5145 2006-07-17 11:48:38Z twisti $ */ @@ -3583,7 +3583,7 @@ gen_method: M_ALD(REG_ITMP3, REG_PV, disp); M_AST_INTERN(REG_ITMP3, REG_SP, 0 * 4); - disp = dseg_addaddress(cd, asm_wrapper_patcher); + disp = dseg_addaddress(cd, asm_patcher_wrapper); M_ALD(REG_ITMP3, REG_PV, disp); M_MTCTR(REG_ITMP3); M_RTS; @@ -4137,7 +4137,7 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd) M_ALD(REG_ITMP3, REG_PV, disp); M_AST(REG_ITMP3, REG_SP, 0 * 4); - disp = dseg_addaddress(cd, asm_wrapper_patcher); + disp = dseg_addaddress(cd, asm_patcher_wrapper); M_ALD(REG_ITMP3, REG_PV, disp); M_MTCTR(REG_ITMP3); M_RTS; @@ -4146,7 +4146,7 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd) codegen_finish(jd); - return jd->code->entrypoint; + return code->entrypoint; } diff --git a/src/vm/jit/x86_64/asmpart.S b/src/vm/jit/x86_64/asmpart.S index 53d2e00c9..ad4650b07 100644 --- a/src/vm/jit/x86_64/asmpart.S +++ b/src/vm/jit/x86_64/asmpart.S @@ -30,7 +30,7 @@ Changes: Edwin Steiner - $Id: asmpart.S 5142 2006-07-17 09:47:02Z twisti $ + $Id: asmpart.S 5145 2006-07-17 11:48:38Z twisti $ */ @@ -65,7 +65,7 @@ .globl asm_abstractmethoderror - .globl asm_wrapper_patcher + .globl asm_patcher_wrapper .globl asm_replacement_out .globl asm_replacement_in @@ -511,7 +511,7 @@ asm_abstractmethoderror: jmp L_asm_handle_exception -/* asm_wrapper_patcher ********************************************************* +/* asm_patcher_wrapper ********************************************************* XXX @@ -526,7 +526,7 @@ asm_abstractmethoderror: *******************************************************************************/ -asm_wrapper_patcher: +asm_patcher_wrapper: push bp /* save base pointer */ mov sp,bp /* move actual sp to bp */ sub $((3+ARG_CNT+TMP_CNT)*8+sizestackframeinfo),sp @@ -558,10 +558,10 @@ asm_wrapper_patcher: add $(5*8),sp /* remove patcher stackframe, keep RA */ test itmp3,itmp3 /* exception thrown? */ - jne L_asm_wrapper_patcher_exception + jne L_asm_patcher_wrapper_exception ret /* call new patched code */ -L_asm_wrapper_patcher_exception: +L_asm_patcher_wrapper_exception: mov itmp3,xptr /* get exception */ pop xpc /* get and remove return address */ jmp L_asm_handle_exception diff --git a/src/vm/jit/x86_64/codegen.c b/src/vm/jit/x86_64/codegen.c index bac0fec5a..0e1a93efd 100644 --- a/src/vm/jit/x86_64/codegen.c +++ b/src/vm/jit/x86_64/codegen.c @@ -30,7 +30,7 @@ Changes: Christian Ullrich Edwin Steiner - $Id: codegen.c 5123 2006-07-12 21:45:34Z twisti $ + $Id: codegen.c 5145 2006-07-17 11:48:38Z twisti $ */ @@ -3878,7 +3878,7 @@ gen_method: M_MOV_IMM(pref->patcher, REG_ITMP3); M_PUSH(REG_ITMP3); - M_MOV_IMM(asm_wrapper_patcher, REG_ITMP3); + M_MOV_IMM(asm_patcher_wrapper, REG_ITMP3); M_JMP(REG_ITMP3); } } @@ -4346,14 +4346,14 @@ u1 *createnativestub(functionptr f, jitdata *jd, methoddesc *nmd) M_MOV_IMM(pref->patcher, REG_ITMP3); M_PUSH(REG_ITMP3); - M_MOV_IMM(asm_wrapper_patcher, REG_ITMP3); + M_MOV_IMM(asm_patcher_wrapper, REG_ITMP3); M_JMP(REG_ITMP3); } } codegen_finish(jd); - return jd->code->entrypoint; + return code->entrypoint; } -- 2.25.1