diff options
| author |  bunnei | 2014-04-27 21:25:16 -0400 |
|---|---|---|
| committer | bunnei | 2014-04-27 21:25:16 -0400 |
| commit | 438dba40c1def91e9de252ef05f8650464e5c0c2 (patch) | |
| tree | 8f323d6095dfefe9d00f34cc4d7229be58a9f409 /src/core/arm/interpreter/armemu.cpp | |
| parent | Merge pull request #4 from cpp3ds/master (diff) | |
| parent | removed DISALLOW_COPY_AND_ASSIGN in favor of NonCopyable class (diff) | |
| download | yuzu-438dba40c1def91e9de252ef05f8650464e5c0c2.tar.gz yuzu-438dba40c1def91e9de252ef05f8650464e5c0c2.tar.xz yuzu-438dba40c1def91e9de252ef05f8650464e5c0c2.zip | |
Merge branch 'hle-interface-updates'
Diffstat (limited to 'src/core/arm/interpreter/armemu.cpp')
| -rw-r--r-- | src/core/arm/interpreter/armemu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/arm/interpreter/armemu.cpp b/src/core/arm/interpreter/armemu.cpp index 6074ff480..a35c5c8dc 100644 --- a/src/core/arm/interpreter/armemu.cpp +++ b/src/core/arm/interpreter/armemu.cpp | |||
| @@ -4467,7 +4467,6 @@ ARMul_Emulate26 (ARMul_State * state) | |||
| 4467 | } | 4467 | } |
| 4468 | /* Drop through. */ | 4468 | /* Drop through. */ |
| 4469 | 4469 | ||
| 4470 | case 0xe0: | ||
| 4471 | case 0xe4: | 4470 | case 0xe4: |
| 4472 | case 0xe6: | 4471 | case 0xe6: |
| 4473 | case 0xe8: | 4472 | case 0xe8: |
| @@ -4502,6 +4501,7 @@ ARMul_Emulate26 (ARMul_State * state) | |||
| 4502 | 4501 | ||
| 4503 | 4502 | ||
| 4504 | /* Co-Processor Register Transfers (MRC) and Data Ops. */ | 4503 | /* Co-Processor Register Transfers (MRC) and Data Ops. */ |
| 4504 | case 0xe0: | ||
| 4505 | case 0xe1: | 4505 | case 0xe1: |
| 4506 | case 0xe3: | 4506 | case 0xe3: |
| 4507 | case 0xe5: | 4507 | case 0xe5: |