diff options
| author |  bunnei | 2015-02-11 12:02:35 -0500 |
|---|---|---|
| committer | bunnei | 2015-02-11 12:02:35 -0500 |
| commit | c51b23b0525d9838e34fa3e008234da658224dad (patch) | |
| tree | aa0bc7f953503ac71424f928792ff9fd641f16ac /src/core/arm/dyncom | |
| parent | Merge pull request #500 from archshift/assert (diff) | |
| parent | arm: Get rid of some magic constants. Specify proper ARM mode. (diff) | |
| download | yuzu-c51b23b0525d9838e34fa3e008234da658224dad.tar.gz yuzu-c51b23b0525d9838e34fa3e008234da658224dad.tar.xz yuzu-c51b23b0525d9838e34fa3e008234da658224dad.zip | |
Merge pull request #559 from lioncash/clean
arm: Some cleanup. Also fixed the initial ARM mode that is emulated.
Diffstat (limited to 'src/core/arm/dyncom')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp index 68fddc94f..1977112dd 100644 --- a/src/core/arm/dyncom/arm_dyncom.cpp +++ b/src/core/arm/dyncom/arm_dyncom.cpp | |||
| @@ -23,7 +23,7 @@ ARM_DynCom::ARM_DynCom() { | |||
| 23 | 23 | ||
| 24 | ARMul_NewState((ARMul_State*)state.get()); | 24 | ARMul_NewState((ARMul_State*)state.get()); |
| 25 | 25 | ||
| 26 | state->abort_model = 0; | 26 | state->abort_model = ABORT_BASE_RESTORED; |
| 27 | state->cpu = (cpu_config_t*)&s_arm11_cpu_info; | 27 | state->cpu = (cpu_config_t*)&s_arm11_cpu_info; |
| 28 | state->bigendSig = LOW; | 28 | state->bigendSig = LOW; |
| 29 | 29 | ||
| @@ -34,7 +34,7 @@ ARM_DynCom::ARM_DynCom() { | |||
| 34 | ARMul_CoProInit(state.get()); | 34 | ARMul_CoProInit(state.get()); |
| 35 | ARMul_Reset(state.get()); | 35 | ARMul_Reset(state.get()); |
| 36 | state->NextInstr = RESUME; // NOTE: This will be overwritten by LoadContext | 36 | state->NextInstr = RESUME; // NOTE: This will be overwritten by LoadContext |
| 37 | state->Emulate = 3; | 37 | state->Emulate = RUN; |
| 38 | 38 | ||
| 39 | state->Reg[15] = 0x00000000; | 39 | state->Reg[15] = 0x00000000; |
| 40 | state->Reg[13] = 0x10000000; // Set stack pointer to the top of the stack | 40 | state->Reg[13] = 0x10000000; // Set stack pointer to the top of the stack |