diff options
| author |  Yuri Kunde Schlesner | 2015-05-29 15:09:26 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-05-29 15:09:26 -0700 |
| commit | a489a846563fc64f236c7ede69ce0eb34af3521a (patch) | |
| tree | 706e345043532d90cd8ca5c41af67fc31dfa7d2e /src/core/arm/disassembler | |
| parent | Merge pull request #817 from linkmauve/citra.ico (diff) | |
| parent | Travis: Add a check for trailing whitespace before any actual compilation. (diff) | |
| download | yuzu-a489a846563fc64f236c7ede69ce0eb34af3521a.tar.gz yuzu-a489a846563fc64f236c7ede69ce0eb34af3521a.tar.xz yuzu-a489a846563fc64f236c7ede69ce0eb34af3521a.zip | |
Merge pull request #818 from linkmauve/no-trailing-whitespace
Ban trailing whitespace from the entire project, forever
Diffstat (limited to 'src/core/arm/disassembler')
| -rw-r--r-- | src/core/arm/disassembler/arm_disasm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/arm/disassembler/arm_disasm.cpp b/src/core/arm/disassembler/arm_disasm.cpp index 913dc1454..f6d44d85a 100644 --- a/src/core/arm/disassembler/arm_disasm.cpp +++ b/src/core/arm/disassembler/arm_disasm.cpp | |||
| @@ -813,7 +813,7 @@ Opcode ARM_Disasm::Decode11(uint32_t insn) { | |||
| 813 | // SWI | 813 | // SWI |
| 814 | return OP_SWI; | 814 | return OP_SWI; |
| 815 | } | 815 | } |
| 816 | 816 | ||
| 817 | uint8_t bit4 = (insn >> 4) & 0x1; | 817 | uint8_t bit4 = (insn >> 4) & 0x1; |
| 818 | uint8_t cpnum = (insn >> 8) & 0xf; | 818 | uint8_t cpnum = (insn >> 8) & 0xf; |
| 819 | 819 | ||