[Qemu-devel] [PATCH 1/5] [sh4] sleep instruction

[Shin-ichiro KAWASAKI]

This patch adds sleep instruction.


diff -ruwN a/target-sh4/cpu.h b/target-sh4/cpu.h
--- a/target-sh4/cpu.h  2008-07-02 05:01:19.000000000 +0900
+++ b/target-sh4/cpu.h  2008-08-18 21:08:54.000000000 +0900
@@ -117,6 +117,7 @@
      CPU_COMMON tlb_t utlb[UTLB_SIZE]; /* unified translation table */
     tlb_t itlb[ITLB_SIZE];     /* instruction translation table */
     void *intc_handle;
+    int intr_at_halt;          /* SR_BL ignored during sleep */
 } CPUSH4State;
 
 CPUSH4State *cpu_sh4_init(const char *cpu_model);
diff -ruwN a/target-sh4/exec.h b/target-sh4/exec.h
--- a/target-sh4/exec.h 2008-05-10 03:45:55.000000000 +0900
+++ b/target-sh4/exec.h 2008-08-18 21:00:35.000000000 +0900
@@ -41,6 +41,7 @@
         return 0;
     if (env->interrupt_request & CPU_INTERRUPT_HARD) {
         env->halted = 0;
+        env->intr_at_halt = 1;
         return 0;
     }
     return EXCP_HALTED;
diff -ruwN a/target-sh4/helper.c b/target-sh4/helper.c
--- a/target-sh4/helper.c       2008-05-10 03:45:55.000000000 +0900
+++ b/target-sh4/helper.c       2008-08-18 21:00:35.000000000 +0900
@@ -87,9 +87,10 @@
         if (do_exp && env->exception_index != 0x1e0) {
             env->exception_index = 0x000; /* masked exception -> reset */
         }
-        if (do_irq) {
+        if (do_irq && !env->intr_at_halt) {
             return; /* masked */
         }
+        env->intr_at_halt = 0;
     }
 
     if (do_irq) {
diff -ruwN a/target-sh4/op.c b/target-sh4/op.c
--- a/target-sh4/op.c   2008-07-16 21:13:52.000000000 +0900
+++ b/target-sh4/op.c   2008-08-18 21:00:35.000000000 +0900
@@ -1091,6 +1091,13 @@
     cpu_loop_exit();
 }
 
+void OPPROTO op_sleep(void)
+{
+    env->halted = 1;
+    env->exception_index = EXCP_HLT;
+    cpu_loop_exit();
+}
+
 /* Load and store */
 #define MEMSUFFIX _raw
 #include "op_mem.c"
diff -ruwN a/target-sh4/translate.c b/target-sh4/translate.c
--- a/target-sh4/translate.c    2008-08-18 05:21:51.000000000 +0900
+++ b/target-sh4/translate.c    2008-08-18 21:00:35.000000000 +0900
@@ -298,7 +298,12 @@
     case 0x0009:               /* nop */
        return;
     case 0x001b:               /* sleep */
-       assert(0);              /* XXXXX */
+       if (ctx->memidx) {
+               gen_op_sleep();
+       } else {
+               gen_op_raise_illegal_instruction();
+               ctx->bstate = BS_EXCP;
+       }
        return;
     }