mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-11-10 01:10:48 +00:00
f7d5278fb3
The failures in r116753 r116756 were caused by a python issue - Python likes to append 'L' suffix to stringified numbers if the number is larger than a machine int. Unfortunately, this causes a divergence of behavior between 32 and 64 bit python versions. I re-crafted elf-dump/common_dump to take care of these issues by: 1. always printing 0x (makes for easy sed/regex) 2. always print fixed length (exactly 2 + numBits/4 digits long) by mod ((2^numBits) - 1) 3. left-padded with '0' There is a residual common routine that is also used by macho-dump (dataToHex) , so I left the 'section_data' test values alone. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@116823 91177308-0d34-0410-b5e6-96231b3b80d8
47 lines
1.4 KiB
Python
47 lines
1.4 KiB
Python
def dataToHex(d):
|
|
""" Convert the raw data in 'd' to an hex string with a space every 4 bytes.
|
|
"""
|
|
bytes = []
|
|
for i,c in enumerate(d):
|
|
byte = ord(c)
|
|
hex_byte = hex(byte)[2:]
|
|
if byte <= 0xf:
|
|
hex_byte = '0' + hex_byte
|
|
if i % 4 == 3:
|
|
hex_byte += ' '
|
|
bytes.append(hex_byte)
|
|
return ''.join(bytes).strip()
|
|
|
|
def dataToHexUnified(d):
|
|
""" Convert the raw data in 'd' to an hex string with a space every 4 bytes.
|
|
Each 4byte number is prefixed with 0x for easy sed/rx
|
|
Fixme: convert all MC tests to use this routine instead of the above
|
|
"""
|
|
bytes = []
|
|
for i,c in enumerate(d):
|
|
byte = ord(c)
|
|
hex_byte = hex(byte)[2:]
|
|
if byte <= 0xf:
|
|
hex_byte = '0' + hex_byte
|
|
if i % 4 == 0:
|
|
hex_byte = '0x' + hex_byte
|
|
if i % 4 == 3:
|
|
hex_byte += ' '
|
|
bytes.append(hex_byte)
|
|
return ''.join(bytes).strip()
|
|
|
|
|
|
def HexDump(val, numBits=32):
|
|
"""
|
|
1. do not print 'L'
|
|
2. Handle negatives and large numbers by mod (2^numBits)
|
|
3. print fixed length, prepend with zeros.
|
|
Length is exactly 2+(numBits/4)
|
|
4. Do print 0x Why?
|
|
so that they can be easily distinguished using sed/rx
|
|
"""
|
|
val = val & (( 1 << numBits) - 1)
|
|
newFmt = "0x%0" + "%d" % (numBits / 4) + "x"
|
|
return newFmt % val
|
|
|