* src/vm/jit/i386/md.c (vm/vm.h): Added.

(md_jit_method_patch_address): Rewritten to new proposed version.

diff --git a/src/vm/jit/i386/md.c b/src/vm/jit/i386/md.c
index 7bd0551c4d9a6b74b5dc0e4a001ce5d1e14009fb..0d13f23098dd69b7c11d0c4dccb2b404fc77220e 100644 (file)
--- a/src/vm/jit/i386/md.c
+++ b/src/vm/jit/i386/md.c
@@ -33,6 +33,7 @@
 #include "vm/types.h"
 
 #include "vm/global.h"
+#include "vm/vm.h"
 
 #include "vm/jit/asmpart.h"
 #include "vm/jit/codegen-common.h"
@@ -99,53 +100,52 @@ u1 *md_stacktrace_get_returnaddress(u1 *sp, u4 framesize)
 
 void *md_jit_method_patch_address(void *pv, void *ra, void *mptr)
 {
-       uint8_t *pc;
-       uint8_t  mcode;
-       int32_t  offset;
-       void    *pa;                        /* patch address                      */
+       uint8_t  *pc;
+       uint16_t  opcode;
+       int32_t   disp;
+       void     *pa;                                            /* patch address */
 
        /* go back to the actual call instruction (2-bytes) */
 
        pc = ((uint8_t *) ra) - 2;
 
-       /* get the last byte of the call */
+       /* Get the opcode of the call. */
 
-       mcode = pc[1];
+       opcode = *((uint16_t *) pc);
 
        /* check for the different calls */
 
-       if (mcode == 0xd1) {
+       switch (opcode) {
+       case 0xd1ff:
                /* INVOKESTATIC/SPECIAL */
 
-               /* patch address is 4-bytes before the call instruction */
+               /* Patch address is 4-bytes before the call instruction. */
 
                pa = pc - 4;
-       }
-       else if (mcode == 0xd2) {
+               break;
+
+       case 0xd2ff:
                /* INVOKEVIRTUAL/INTERFACE */
 
-               /* return NULL if no mptr was specified (used for replacement) */
+               /* Return NULL if no mptr was specified (used for
+                  replacement). */
 
                if (mptr == NULL)
                        return NULL;
 
-               /* Get the offset from the instruction (the offset address is
-                  4-bytes before the call instruction). */
-
-               offset = *((int32_t *) (pc - 4));
+               /* Get the displacement from the instruction (the displacement
+                  address is 4-bytes before the call instruction). */
 
-               /* add the offset to the method pointer */
-
-               pa = ((uint8_t *) mptr) + offset;
-       }
-       else {
-               /* catch any problems */
+               disp = *((int32_t *) (pc - 4));
 
-               vm_abort("couldn't find a proper call instruction sequence");
+               /* Add the displacement to the method pointer. */
 
-               /* Keep compiler happy. */
+               pa = ((uint8_t *) mptr) + disp;
+               break;
 
-               pa = NULL;
+       default:
+               vm_abort_disassemble(pc, 1, "md_jit_method_patch_address: unknown instruction %x", opcode);
+               return NULL;
        }
 
        return pa;