AMD NOR flash device support (initial patch by Jocelyn Mayer)

[qemu] / dyngen.h

diff --git a/dyngen.h b/dyngen.h
index 76866d4..fe0a936 100644 (file)
--- a/dyngen.h
+++ b/dyngen.h
@@ -19,7 +19,13 @@
  */
 
 int __op_param1, __op_param2, __op_param3;
-int __op_gen_label1, __op_gen_label2, __op_gen_label3;
+#ifdef __sparc__
+  void __op_gen_label1(){}
+  void __op_gen_label2(){}
+  void __op_gen_label3(){}
+#else
+  int __op_gen_label1, __op_gen_label2, __op_gen_label3;
+#endif
 int __op_jmp0, __op_jmp1, __op_jmp2, __op_jmp3;
 
 #ifdef __i386__
@@ -420,6 +426,9 @@ static inline void ia64_apply_fixes (uint8_t **gen_code_pp,
        }
        ia64_imm22(fixup->addr, (long) vp - gp);
     }
+    /* Keep code ptr aligned. */
+    if ((long) gen_code_ptr & 15)
+       gen_code_ptr += 8;
     *gen_code_pp = gen_code_ptr;
 }