diff options
| -rw-r--r-- | lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp | 11 | ||||
| -rw-r--r-- | test/MC/PowerPC/ppc-nop.s | 5 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp b/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp index 91f1160..0d42081 100644 --- a/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp +++ b/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp @@ -132,14 +132,17 @@ public: } bool writeNopData(uint64_t Count, MCObjectWriter *OW) const { - // Can't emit NOP with size not multiple of 32-bits - if (Count % 4 != 0) - return false; - uint64_t NumNops = Count / 4; for (uint64_t i = 0; i != NumNops; ++i) OW->Write32(0x60000000); + switch (Count % 4) { + default: break; // No leftover bytes to write + case 1: OW->Write8(0); break; + case 2: OW->Write16(0); break; + case 3: OW->Write16(0); OW->Write8(0); break; + } + return true; } diff --git a/test/MC/PowerPC/ppc-nop.s b/test/MC/PowerPC/ppc-nop.s index 567943c..50afae2 100644 --- a/test/MC/PowerPC/ppc-nop.s +++ b/test/MC/PowerPC/ppc-nop.s @@ -5,5 +5,8 @@ blr .p2align 3 blr -# CHECK: 0000: 4E800020 60000000 4E800020 +.byte 0x42 +.p2align 2 + +# CHECK: 0000: 4E800020 60000000 4E800020 42000000 |