From 8194f35a0c71a3bf169459bf715bea53b7bbc904 Mon Sep 17 00:00:00 2001 From: Igor Kovalenko Date: Mon, 3 Aug 2009 23:15:02 +0400 Subject: Sparc64: replace tsptr with helper routine tl and tsptr of members sparc64 cpu state must be changed simultaneously to keep trap state window in sync with current trap level. Currently translation of store to tl does not change tsptr, which leads to corrupt trap state on corresponding trap level. This patch removes tsptr from sparc64 cpu state and replaces all uses with call to helper routine. Changes v0->v1: - reimplemented helper routine with tcg generator - on cpu reset trap type and pstate are populated with power-on reset values, including tl=maxtl Signed-off-by: igor.v.kovalenko@gmail.com Signed-off-by: Blue Swirl --- linux-user/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux-user/main.c') diff --git a/linux-user/main.c b/linux-user/main.c index bc903dec0a..aa381f60d2 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -962,7 +962,7 @@ void cpu_loop (CPUSPARCState *env) if (trapnr == TT_DFAULT) info._sifields._sigfault._addr = env->dmmuregs[4]; else - info._sifields._sigfault._addr = env->tsptr->tpc; + info._sifields._sigfault._addr = cpu_tsptr(env)->tpc; queue_signal(env, info.si_signo, &info); } break; -- cgit v1.2.3