mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-02-20 14:29:27 +00:00
"BinaryObject.h was implicitly converting between uint{16,32,64}_t to
uint8_t (via 'foo & 255'), i replaced this with an explicit (uint8_t) cast which is equivalent, faster and more correct (silences type-related warnings). Also, following coding standards I replaced post-increment with pre-increment." Patch by Ryan Flynn! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74929 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
df225c0253
commit
393aec6a44
@ -86,15 +86,15 @@ public:
|
|||||||
/// emitWord16LE - This callback is invoked when a 16-bit word needs to be
|
/// emitWord16LE - This callback is invoked when a 16-bit word needs to be
|
||||||
/// written to the data stream in correct endian format and correct size.
|
/// written to the data stream in correct endian format and correct size.
|
||||||
inline void emitWord16LE(uint16_t W) {
|
inline void emitWord16LE(uint16_t W) {
|
||||||
Data.push_back((W >> 0) & 255);
|
Data.push_back((uint8_t)(W >> 0));
|
||||||
Data.push_back((W >> 8) & 255);
|
Data.push_back((uint8_t)(W >> 8));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// emitWord16BE - This callback is invoked when a 16-bit word needs to be
|
/// emitWord16BE - This callback is invoked when a 16-bit word needs to be
|
||||||
/// written to the data stream in correct endian format and correct size.
|
/// written to the data stream in correct endian format and correct size.
|
||||||
inline void emitWord16BE(uint16_t W) {
|
inline void emitWord16BE(uint16_t W) {
|
||||||
Data.push_back((W >> 8) & 255);
|
Data.push_back((uint8_t)(W >> 8));
|
||||||
Data.push_back((W >> 0) & 255);
|
Data.push_back((uint8_t)(W >> 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// emitWord - This callback is invoked when a word needs to be
|
/// emitWord - This callback is invoked when a word needs to be
|
||||||
@ -127,46 +127,46 @@ public:
|
|||||||
/// emitWordLE - This callback is invoked when a 32-bit word needs to be
|
/// emitWordLE - This callback is invoked when a 32-bit word needs to be
|
||||||
/// written to the data stream in little-endian format.
|
/// written to the data stream in little-endian format.
|
||||||
inline void emitWordLE(uint32_t W) {
|
inline void emitWordLE(uint32_t W) {
|
||||||
Data.push_back((W >> 0) & 255);
|
Data.push_back((uint8_t)(W >> 0));
|
||||||
Data.push_back((W >> 8) & 255);
|
Data.push_back((uint8_t)(W >> 8));
|
||||||
Data.push_back((W >> 16) & 255);
|
Data.push_back((uint8_t)(W >> 16));
|
||||||
Data.push_back((W >> 24) & 255);
|
Data.push_back((uint8_t)(W >> 24));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// emitWordBE - This callback is invoked when a 32-bit word needs to be
|
/// emitWordBE - This callback is invoked when a 32-bit word needs to be
|
||||||
/// written to the data stream in big-endian format.
|
/// written to the data stream in big-endian format.
|
||||||
///
|
///
|
||||||
inline void emitWordBE(uint32_t W) {
|
inline void emitWordBE(uint32_t W) {
|
||||||
Data.push_back((W >> 24) & 255);
|
Data.push_back((uint8_t)(W >> 24));
|
||||||
Data.push_back((W >> 16) & 255);
|
Data.push_back((uint8_t)(W >> 16));
|
||||||
Data.push_back((W >> 8) & 255);
|
Data.push_back((uint8_t)(W >> 8));
|
||||||
Data.push_back((W >> 0) & 255);
|
Data.push_back((uint8_t)(W >> 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// emitDWordLE - This callback is invoked when a 64-bit word needs to be
|
/// emitDWordLE - This callback is invoked when a 64-bit word needs to be
|
||||||
/// written to the data stream in little-endian format.
|
/// written to the data stream in little-endian format.
|
||||||
inline void emitDWordLE(uint64_t W) {
|
inline void emitDWordLE(uint64_t W) {
|
||||||
Data.push_back((W >> 0) & 255);
|
Data.push_back((uint8_t)(W >> 0));
|
||||||
Data.push_back((W >> 8) & 255);
|
Data.push_back((uint8_t)(W >> 8));
|
||||||
Data.push_back((W >> 16) & 255);
|
Data.push_back((uint8_t)(W >> 16));
|
||||||
Data.push_back((W >> 24) & 255);
|
Data.push_back((uint8_t)(W >> 24));
|
||||||
Data.push_back((W >> 32) & 255);
|
Data.push_back((uint8_t)(W >> 32));
|
||||||
Data.push_back((W >> 40) & 255);
|
Data.push_back((uint8_t)(W >> 40));
|
||||||
Data.push_back((W >> 48) & 255);
|
Data.push_back((uint8_t)(W >> 48));
|
||||||
Data.push_back((W >> 56) & 255);
|
Data.push_back((uint8_t)(W >> 56));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// emitDWordBE - This callback is invoked when a 64-bit word needs to be
|
/// emitDWordBE - This callback is invoked when a 64-bit word needs to be
|
||||||
/// written to the data stream in big-endian format.
|
/// written to the data stream in big-endian format.
|
||||||
inline void emitDWordBE(uint64_t W) {
|
inline void emitDWordBE(uint64_t W) {
|
||||||
Data.push_back((W >> 56) & 255);
|
Data.push_back((uint8_t)(W >> 56));
|
||||||
Data.push_back((W >> 48) & 255);
|
Data.push_back((uint8_t)(W >> 48));
|
||||||
Data.push_back((W >> 40) & 255);
|
Data.push_back((uint8_t)(W >> 40));
|
||||||
Data.push_back((W >> 32) & 255);
|
Data.push_back((uint8_t)(W >> 32));
|
||||||
Data.push_back((W >> 24) & 255);
|
Data.push_back((uint8_t)(W >> 24));
|
||||||
Data.push_back((W >> 16) & 255);
|
Data.push_back((uint8_t)(W >> 16));
|
||||||
Data.push_back((W >> 8) & 255);
|
Data.push_back((uint8_t)(W >> 8));
|
||||||
Data.push_back((W >> 0) & 255);
|
Data.push_back((uint8_t)(W >> 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// fixByte - This callback is invoked when a byte needs to be
|
/// fixByte - This callback is invoked when a byte needs to be
|
||||||
@ -187,15 +187,15 @@ public:
|
|||||||
/// emitWord16LE - This callback is invoked when a 16-bit word needs to
|
/// emitWord16LE - This callback is invoked when a 16-bit word needs to
|
||||||
/// fixup the data stream in little endian format.
|
/// fixup the data stream in little endian format.
|
||||||
inline void fixWord16LE(uint16_t W, uint32_t offset) {
|
inline void fixWord16LE(uint16_t W, uint32_t offset) {
|
||||||
Data[offset++] = W & 255;
|
Data[offset] = (uint8_t)(W >> 0);
|
||||||
Data[offset] = (W >> 8) & 255;
|
Data[++offset] = (uint8_t)(W >> 8);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// fixWord16BE - This callback is invoked when a 16-bit word needs to
|
/// fixWord16BE - This callback is invoked when a 16-bit word needs to
|
||||||
/// fixup data stream in big endian format.
|
/// fixup data stream in big endian format.
|
||||||
inline void fixWord16BE(uint16_t W, uint32_t offset) {
|
inline void fixWord16BE(uint16_t W, uint32_t offset) {
|
||||||
Data[offset++] = (W >> 8) & 255;
|
Data[offset] = (uint8_t)(W >> 8);
|
||||||
Data[offset] = W & 255;
|
Data[++offset] = (uint8_t)(W >> 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// emitWord - This callback is invoked when a word needs to
|
/// emitWord - This callback is invoked when a word needs to
|
||||||
@ -219,19 +219,19 @@ public:
|
|||||||
/// fixWord32LE - This callback is invoked when a 32-bit word needs to
|
/// fixWord32LE - This callback is invoked when a 32-bit word needs to
|
||||||
/// fixup the data in little endian format.
|
/// fixup the data in little endian format.
|
||||||
inline void fixWord32LE(uint32_t W, uint32_t offset) {
|
inline void fixWord32LE(uint32_t W, uint32_t offset) {
|
||||||
Data[offset++] = W & 255;
|
Data[offset] = (uint8_t)(W >> 0);
|
||||||
Data[offset++] = (W >> 8) & 255;
|
Data[++offset] = (uint8_t)(W >> 8);
|
||||||
Data[offset++] = (W >> 16) & 255;
|
Data[++offset] = (uint8_t)(W >> 16);
|
||||||
Data[offset] = (W >> 24) & 255;
|
Data[++offset] = (uint8_t)(W >> 24);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// fixWord32BE - This callback is invoked when a 32-bit word needs to
|
/// fixWord32BE - This callback is invoked when a 32-bit word needs to
|
||||||
/// fixup the data in big endian format.
|
/// fixup the data in big endian format.
|
||||||
inline void fixWord32BE(uint32_t W, uint32_t offset) {
|
inline void fixWord32BE(uint32_t W, uint32_t offset) {
|
||||||
Data[offset++] = (W >> 24) & 255;
|
Data[offset] = (uint8_t)(W >> 24);
|
||||||
Data[offset++] = (W >> 16) & 255;
|
Data[++offset] = (uint8_t)(W >> 16);
|
||||||
Data[offset++] = (W >> 8) & 255;
|
Data[++offset] = (uint8_t)(W >> 8);
|
||||||
Data[offset] = W & 255;
|
Data[++offset] = (uint8_t)(W >> 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// fixWord64 - This callback is invoked when a 64-bit word needs to
|
/// fixWord64 - This callback is invoked when a 64-bit word needs to
|
||||||
@ -246,27 +246,27 @@ public:
|
|||||||
/// fixWord64BE - This callback is invoked when a 64-bit word needs to
|
/// fixWord64BE - This callback is invoked when a 64-bit word needs to
|
||||||
/// fixup the data in little endian format.
|
/// fixup the data in little endian format.
|
||||||
inline void fixWord64LE(uint64_t W, uint32_t offset) {
|
inline void fixWord64LE(uint64_t W, uint32_t offset) {
|
||||||
Data[offset++] = W & 255;
|
Data[offset] = (uint8_t)(W >> 0);
|
||||||
Data[offset++] = (W >> 8) & 255;
|
Data[++offset] = (uint8_t)(W >> 8);
|
||||||
Data[offset++] = (W >> 16) & 255;
|
Data[++offset] = (uint8_t)(W >> 16);
|
||||||
Data[offset++] = (W >> 24) & 255;
|
Data[++offset] = (uint8_t)(W >> 24);
|
||||||
Data[offset++] = (W >> 32) & 255;
|
Data[++offset] = (uint8_t)(W >> 32);
|
||||||
Data[offset++] = (W >> 40) & 255;
|
Data[++offset] = (uint8_t)(W >> 40);
|
||||||
Data[offset++] = (W >> 48) & 255;
|
Data[++offset] = (uint8_t)(W >> 48);
|
||||||
Data[offset] = (W >> 56) & 255;
|
Data[++offset] = (uint8_t)(W >> 56);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// fixWord64BE - This callback is invoked when a 64-bit word needs to
|
/// fixWord64BE - This callback is invoked when a 64-bit word needs to
|
||||||
/// fixup the data in big endian format.
|
/// fixup the data in big endian format.
|
||||||
inline void fixWord64BE(uint64_t W, uint32_t offset) {
|
inline void fixWord64BE(uint64_t W, uint32_t offset) {
|
||||||
Data[offset++] = (W >> 56) & 255;
|
Data[offset] = (uint8_t)(W >> 56);
|
||||||
Data[offset++] = (W >> 48) & 255;
|
Data[++offset] = (uint8_t)(W >> 48);
|
||||||
Data[offset++] = (W >> 40) & 255;
|
Data[++offset] = (uint8_t)(W >> 40);
|
||||||
Data[offset++] = (W >> 32) & 255;
|
Data[++offset] = (uint8_t)(W >> 32);
|
||||||
Data[offset++] = (W >> 24) & 255;
|
Data[++offset] = (uint8_t)(W >> 24);
|
||||||
Data[offset++] = (W >> 16) & 255;
|
Data[++offset] = (uint8_t)(W >> 16);
|
||||||
Data[offset++] = (W >> 8) & 255;
|
Data[++offset] = (uint8_t)(W >> 8);
|
||||||
Data[offset] = W & 255;
|
Data[++offset] = (uint8_t)(W >> 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// emitAlignment - Pad the data to the specified alignment.
|
/// emitAlignment - Pad the data to the specified alignment.
|
||||||
@ -281,7 +281,7 @@ public:
|
|||||||
/// written to the data stream.
|
/// written to the data stream.
|
||||||
void emitULEB128Bytes(uint64_t Value) {
|
void emitULEB128Bytes(uint64_t Value) {
|
||||||
do {
|
do {
|
||||||
unsigned char Byte = Value & 0x7f;
|
uint8_t Byte = (uint8_t)(Value & 0x7f);
|
||||||
Value >>= 7;
|
Value >>= 7;
|
||||||
if (Value) Byte |= 0x80;
|
if (Value) Byte |= 0x80;
|
||||||
emitByte(Byte);
|
emitByte(Byte);
|
||||||
@ -295,7 +295,7 @@ public:
|
|||||||
bool IsMore;
|
bool IsMore;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
unsigned char Byte = Value & 0x7f;
|
uint8_t Byte = (uint8_t)(Value & 0x7f);
|
||||||
Value >>= 7;
|
Value >>= 7;
|
||||||
IsMore = Value != Sign || ((Byte ^ Sign) & 0x40) != 0;
|
IsMore = Value != Sign || ((Byte ^ Sign) & 0x40) != 0;
|
||||||
if (IsMore) Byte |= 0x80;
|
if (IsMore) Byte |= 0x80;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user