* Merged in twisti-branch.

[cacao.git] / src / vm / jit / arm / md.c

diff --git a/src/vm/jit/arm/md.c b/src/vm/jit/arm/md.c
index d11f44643efe7a6a7b0a99f3164a72dc4f38380e..cfdbda40dd6ae00b3572b4ed103f11d3fef4693d 100644 (file)
--- a/src/vm/jit/arm/md.c
+++ b/src/vm/jit/arm/md.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: md.c 7259 2007-01-30 13:58:35Z twisti $
+   $Id: md.c 7540 2007-03-20 00:02:41Z michi $
 
 */
 
@@ -41,6 +41,8 @@
 #include "vm/jit/asmpart.h"
 #include "vm/jit/md.h"
 
+#include "vm/jit/codegen-common.h" /* REMOVE ME: for codegendata */
+
 
 /* md_init *********************************************************************
 
@@ -76,6 +78,10 @@ void md_codegen_patch_branch(codegendata *cd, s4 branchmpc, s4 targetmpc)
        if ((disp < (s4) 0xff000000) || (disp > (s4) 0x00ffffff))
                vm_abort("md_codegen_patch_branch: branch displacement out of range: %d > +/-%d", disp, 0x00ffffff);
 
+       /* sanity check: are we really patching a branch instruction */
+
+       assert((mcodeptr[-1] & 0x0e000000) == 0x0a000000);
+
        /* patch the branch instruction before the mcodeptr */
 
        mcodeptr[-1] |= (disp & 0x00ffffff);