diff options
| author | Igor Kovalenko <igor.v.kovalenko@gmail.com> | 2009-08-03 23:15:02 +0400 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2009-08-04 20:22:10 +0000 |
| commit | 8194f35a0c71a3bf169459bf715bea53b7bbc904 (patch) | |
| tree | 46db943bff1e3129cbf61e3065dd27530f34022d /target-sparc/cpu.h | |
| parent | a16aae0ca427f117c51d80e5d72e18b141595496 (diff) | |
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 <blauwirbel@gmail.com>
Diffstat (limited to 'target-sparc/cpu.h')
| -rw-r--r-- | target-sparc/cpu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index 490fd7b57f..2428bb2927 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -49,6 +49,7 @@ #define TT_NCP_INSN 0x24 #define TT_TRAP 0x80 #else +#define TT_POWER_ON_RESET 0x01 #define TT_TFAULT 0x08 #define TT_CODE_ACCESS 0x0a #define TT_ILL_INSN 0x10 @@ -377,7 +378,6 @@ typedef struct CPUSPARCState { #if defined(TARGET_SPARC64) #define MAXTL_MAX 8 #define MAXTL_MASK (MAXTL_MAX - 1) - trap_state *tsptr; trap_state ts[MAXTL_MAX]; uint32_t xcc; /* Extended integer condition codes */ uint32_t asi; @@ -593,6 +593,7 @@ void cpu_check_irqs(CPUSPARCState *env); void cpu_tick_set_count(void *opaque, uint64_t count); uint64_t cpu_tick_get_count(void *opaque); void cpu_tick_set_limit(void *opaque, uint64_t limit); +trap_state* cpu_tsptr(CPUState* env); #endif static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) |