Revision 0fa85d43 target-sparc/helper.c

b/target-sparc/helper.c
62 62
   NULL, it means that the function was called in C code (i.e. not
63 63
   from generated code or from helper.c) */
64 64
/* XXX: fix it to restore all registers */
65
void tlb_fill(unsigned long addr, int is_write, int is_user, void *retaddr)
65
void tlb_fill(target_ulong addr, int is_write, int is_user, void *retaddr)
66 66
{
67 67
    TranslationBlock *tb;
68 68
    int ret;
......
282 282
    env->regwptr = env->regbase + (new_cwp * 16);
283 283
}
284 284

  
285
void cpu_set_cwp(CPUState *env1, int new_cwp)
286
{
287
    CPUState *saved_env;
288
    saved_env = env;
289
    env = env1;
290
    set_cwp(new_cwp);
291
    env = saved_env;
292
}
293

  
285 294
/*
286 295
 * Begin execution of an interruption. is_int is TRUE if coming from
287 296
 * the int instruction. next_eip is the EIP value AFTER the interrupt
......
318 327
#endif
319 328
#if !defined(CONFIG_USER_ONLY) 
320 329
    if (env->psret == 0) {
321
	fprintf(logfile, "Trap while interrupts disabled, Error state!\n");
322
	qemu_system_shutdown_request();
330
        cpu_abort(cpu_single_env, "Trap while interrupts disabled, Error state");
323 331
	return;
324 332
    }
325 333
#endif

Also available in: Unified diff