mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.qemu.org/qemu

Browse Source
This commit is contained in:
malc 2012-06-15 15:53:34 +04:00
commit 63bb682a18
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cpu-exec.c
View File

@ -467,12 +467,19 @@ int cpu_exec(CPUArchState *env)
do_interrupt(env); do_interrupt(env);
next_tb = 0; next_tb = 0;
} }
if (interrupt_request & CPU_INTERRUPT_NMI if (interrupt_request & CPU_INTERRUPT_NMI) {
&& (env->pregs[PR_CCS] & M_FLAG)) { unsigned int m_flag_archval;
if (env->pregs[PR_VR] < 32) {
m_flag_archval = M_FLAG_V10;
} else {
m_flag_archval = M_FLAG_V32;
}
if ((env->pregs[PR_CCS] & m_flag_archval)) {
env->exception_index = EXCP_NMI; env->exception_index = EXCP_NMI;
do_interrupt(env); do_interrupt(env);
next_tb = 0; next_tb = 0;
} }
}
#elif defined(TARGET_M68K) #elif defined(TARGET_M68K)
if (interrupt_request & CPU_INTERRUPT_HARD if (interrupt_request & CPU_INTERRUPT_HARD
&& ((env->sr & SR_I) >> SR_I_SHIFT) && ((env->sr & SR_I) >> SR_I_SHIFT)

3
target-cris/cpu.h
View File

@ -69,13 +69,14 @@
/* CPU flags. */ /* CPU flags. */
#define Q_FLAG 0x80000000 #define Q_FLAG 0x80000000
#define M_FLAG 0x40000000 #define M_FLAG_V32 0x40000000
#define PFIX_FLAG 0x800 /* CRISv10 Only. */ #define PFIX_FLAG 0x800 /* CRISv10 Only. */
#define F_FLAG_V10 0x400 #define F_FLAG_V10 0x400
#define P_FLAG_V10 0x200 #define P_FLAG_V10 0x200
#define S_FLAG 0x200 #define S_FLAG 0x200
#define R_FLAG 0x100 #define R_FLAG 0x100
#define P_FLAG 0x80 #define P_FLAG 0x80
#define M_FLAG_V10 0x80
#define U_FLAG 0x40 #define U_FLAG 0x40
#define I_FLAG 0x20 #define I_FLAG 0x20
#define X_FLAG 0x10 #define X_FLAG 0x10

4
target-cris/helper.c
View File

@ -127,7 +127,7 @@ static void do_interruptv10(CPUCRISState *env)
case EXCP_NMI: case EXCP_NMI:
/* NMI is hardwired to vector zero. */ /* NMI is hardwired to vector zero. */
ex_vec = 0; ex_vec = 0;
env->pregs[PR_CCS] &= ~M_FLAG; env->pregs[PR_CCS] &= ~M_FLAG_V10;
env->pregs[PRV10_BRP] = env->pc; env->pregs[PRV10_BRP] = env->pc;
break; break;
@ -185,7 +185,7 @@ void do_interrupt(CPUCRISState *env)
case EXCP_NMI: case EXCP_NMI:
/* NMI is hardwired to vector zero. */ /* NMI is hardwired to vector zero. */
ex_vec = 0; ex_vec = 0;
env->pregs[PR_CCS] &= ~M_FLAG; env->pregs[PR_CCS] &= ~M_FLAG_V32;
env->pregs[PR_NRP] = env->pc; env->pregs[PR_NRP] = env->pc;
break; break;

2
target-cris/op_helper.c
View File

@ -248,7 +248,7 @@ void helper_rfn(void)
env->pregs[PR_CCS] |= P_FLAG; env->pregs[PR_CCS] |= P_FLAG;
/* Always set the M flag. */ /* Always set the M flag. */
env->pregs[PR_CCS] |= M_FLAG; env->pregs[PR_CCS] |= M_FLAG_V32;
} }
uint32_t helper_lz(uint32_t t0) uint32_t helper_lz(uint32_t t0)