gwj / at91sam9263 · Commits

Commit 833ed38689cca2b024f7952269f17d7bf2ab6de4

Authored by aurel32
1 parent f3d8b1eb

[sh4] sleep instruction 

This patch adds sleep instruction.

(Shin-ichiro KAWASAKI)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5065 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 5 changed files with 17 additions and 2 deletions
target-sh4/cpu.h
  View file @833ed38
... ... @@ -117,6 +117,7 @@ typedef struct CPUSH4State {
117 117 CPU_COMMON tlb_t utlb[UTLB_SIZE]; /* unified translation table */
118 118 tlb_t itlb[ITLB_SIZE]; /* instruction translation table */
119 119 void *intc_handle;
  120 + int intr_at_halt; /* SR_BL ignored during sleep */
120 121 } CPUSH4State;
121 122  
122 123 CPUSH4State *cpu_sh4_init(const char *cpu_model);
... ...
target-sh4/exec.h
  View file @833ed38
... ... @@ -41,6 +41,7 @@ static inline int cpu_halted(CPUState *env) {
41 41 return 0;
42 42 if (env->interrupt_request & CPU_INTERRUPT_HARD) {
43 43 env->halted = 0;
  44 + env->intr_at_halt = 1;
44 45 return 0;
45 46 }
46 47 return EXCP_HALTED;
... ...
target-sh4/helper.c
  View file @833ed38
... ... @@ -87,9 +87,10 @@ void do_interrupt(CPUState * env)
87 87 if (do_exp && env->exception_index != 0x1e0) {
88 88 env->exception_index = 0x000; /* masked exception -> reset */
89 89 }
90   - if (do_irq) {
  90 + if (do_irq && !env->intr_at_halt) {
91 91 return; /* masked */
92 92 }
  93 + env->intr_at_halt = 0;
93 94 }
94 95  
95 96 if (do_irq) {
... ...
target-sh4/op.c
  View file @833ed38
... ... @@ -1091,6 +1091,13 @@ void OPPROTO op_debug(void)
1091 1091 cpu_loop_exit();
1092 1092 }
1093 1093  
  1094 +void OPPROTO op_sleep(void)
  1095 +{
  1096 + env->halted = 1;
  1097 + env->exception_index = EXCP_HLT;
  1098 + cpu_loop_exit();
  1099 +}
  1100 +
1094 1101 /* Load and store */
1095 1102 #define MEMSUFFIX _raw
1096 1103 #include "op_mem.c"
... ...
target-sh4/translate.c
  View file @833ed38
... ... @@ -298,7 +298,12 @@ void _decode_opc(DisasContext * ctx)
298 298 case 0x0009: /* nop */
299 299 return;
300 300 case 0x001b: /* sleep */
301   - assert(0); /* XXXXX */
  301 + if (ctx->memidx) {
  302 + gen_op_sleep();
  303 + } else {
  304 + gen_op_raise_illegal_instruction();
  305 + ctx->bstate = BS_EXCP;
  306 + }
302 307 return;
303 308 }
304 309  
... ...