Merged branch subtype-trunk into default.

[cacao.git] / src / vm / jit / i386 / emit.c

diff --git a/src/vm/jit/i386/emit.c b/src/vm/jit/i386/emit.c
index c3bf7e4eebdbd6a314776363d80a4aebcaba3de5..3a264f162542561af62ca4197e098192313699a4 100644 (file)
--- a/src/vm/jit/i386/emit.c
+++ b/src/vm/jit/i386/emit.c
@@ -33,7 +33,7 @@
 #include "vm/jit/i386/emit.h"
 #include "vm/jit/i386/md-abi.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/lock.hpp"
 
@@ -1313,6 +1313,7 @@ void emit_jcc(codegendata *cd, s4 opc, s4 imm)
  */
 void emit_setcc_reg(codegendata *cd, s4 opc, s4 reg)
 {
+       assert(reg < 4);                     /* Can only operate on al, bl, cl, dl. */
        *(cd->mcodeptr++) = 0x0f;
        *(cd->mcodeptr++) = 0x90 + (u1) (opc);
        emit_reg(0,(reg));