diff --git a/analysis/analyze_rom.py b/analysis/analyze_rom.py deleted file mode 100644 index d09dc7a..0000000 --- a/analysis/analyze_rom.py +++ /dev/null @@ -1,45 +0,0 @@ -import r2pipe -import json -import sys - -# Load local disasm from disassembler dir -sys.path.append("../disassembler") -from adsp219x_disasm import decode_24 - -def analyze_rom(filename): - """ - Automated ROM analysis using radare2 + Python disassembler. - """ - r2 = r2pipe.open(filename) - r2.cmd("e asm.arch = adsp219x") # Custom arch handled by our script logic - r2.cmd("aa") # Basic analysis (will fail but good practice) - - # Iterate over file bytes - file_info = json.loads(r2.cmd("iX")) - size = file_info[0]["size"] - - print(f"Analyzing {filename} ({size} bytes)...") - - # 3-byte step for ADSP-219x - for offset in range(0, size, 3): - # Read 3 bytes - chunk = r2.cmdj(f"pxj 3 @ {offset}") - if not chunk or len(chunk) < 3: break - - opcode = (chunk[0] << 16) | (chunk[1] << 8) | chunk[2] - disasm = decode_24(opcode) - - # Set flags, comments, etc., back into r2 - r2.cmd(f"CC {disasm} @ {offset}") - print(f"0x{offset:04X}: {disasm}") - - # Output comment report - print("\nAnalysis Summary:\n") - print(r2.cmd("CC")) - r2.quit() - -if __name__ == "__main__": - if len(sys.argv) < 2: - print("Usage: analyze_rom.py ") - else: - analyze_rom(sys.argv[1]) diff --git a/disassembler/adsp219x_disasm.py b/disassembler/adsp219x_disasm.py deleted file mode 100644 index 74760d2..0000000 --- a/disassembler/adsp219x_disasm.py +++ /dev/null @@ -1,147 +0,0 @@ -import sys - -# AMF (ALU/Multiplier Function) codes (5 bits, 0-31) -AMF_ALU = { - 0x10: "Y", 0x11: "Y+1", 0x12: "X+Y+C", 0x13: "X+Y", - 0x14: "NOT Y", 0x15: "-Y", 0x16: "X-Y+C-1", 0x17: "X-Y", - 0x18: "Y-1", 0x19: "Y-X", 0x1a: "Y-X+C-1", 0x1b: "NOT X", - 0x1c: "X AND Y", 0x1d: "X OR Y", 0x1e: "X XOR Y", 0x1f: "ABS X" -} -AMF_MAC = { - 0x00: "NOP", 0x01: "X * Y (RND)", 0x02: "MR + X * Y (RND)", - 0x03: "MR - X * Y (RND)", 0x04: "X * Y (SS)", 0x05: "X * Y (SU)", - 0x06: "X * Y (US)", 0x07: "X * Y (UU)", 0x08: "MR + X * Y (SS)", - 0x09: "MR + X * Y (SU)", 0x0a: "MR + X * Y (US)", 0x0b: "MR + X * Y (UU)", - 0x0c: "MR - X * Y (SS)", 0x0d: "MR - X * Y (SU)", 0x0e: "MR - X * Y (US)", - 0x0f: "MR - X * Y (UU)" -} - -# Registers (RGP, Address) -REG_MAP = { - (0,0): "AX0", (0,1): "AX1", (0,2): "MX0", (0,3): "MX1", - (0,4): "AY0", (0,5): "AY1", (0,6): "MY0", (0,7): "MY1", - (0,8): "MR2", (0,9): "SR2", (0,10): "AR", (0,11): "SI", - (0,12): "MR1", (0,13): "SR1", (0,14): "MR0", (0,15): "SR0", - (1,0): "I0", (1,1): "I1", (1,2): "I2", (1,3): "I3", - (1,4): "M0", (1,5): "M1", (1,6): "M2", (1,7): "M3", - (1,8): "L0", (1,9): "L1", (1,10): "L2", (1,11): "L3", - (1,12): "IMASK", (1,13): "IRPTL", (1,14): "ICNTL", (1,15): "STACKA", - (2,0): "I4", (2,1): "I5", (2,2): "I6", (2,3): "I7", - (2,4): "M4", (2,5): "M5", (2,6): "M6", (2,7): "M7", - (2,8): "L4", (2,9): "L5", (2,10): "L6", (2,11): "L7", - (2,12): "RSVD", (2,13): "CNTR", (2,14): "LPSTACKA", (2,15): "RSVD", - (3,0): "ASTAT", (3,1): "MSTAT", (3,2): "SSTAT", (3,3): "LPSTACKP", - (3,4): "CCODE", (3,5): "SE", (3,6): "SB", (3,7): "PX", - (3,8): "DMPG1", (3,9): "DMPG2", (3,10): "IOPG", (3,11): "IJPG", - (3,15): "STACKP" -} - -# Condition Codes -COND_CODES = { - 0x0: "EQ", 0x1: "NE", 0x2: "GT", 0x3: "LE", 0x4: "LT", 0x5: "GE", - 0x6: "AV", 0x7: "NOT AV", 0x8: "AC", 0x9: "NOT AC", 0xA: "SWCOND", - 0xB: "NOT SWCOND", 0xC: "MV", 0xD: "NOT MV", 0xE: "NOT CE", 0xF: "TRUE" -} - -# XOP/YOP Code for ALU/MAC -XOP_ALU = ["AX0", "AX1", "AR", "MR0", "MR1", "MR2", "SR0", "SR1"] -YOP_ALU = ["AY0", "AY1", "AF", "0"] # 11 = 0 -XOP_MAC = ["MX0", "MX1", "AR", "MR0", "MR1", "MR2", "SR0", "SR1"] -YOP_MAC = ["MY0", "MY1", "SR1", "0"] - -def get_reg_name(rgp, addr): - return REG_MAP.get((rgp, addr), f"REG({rgp},{addr})") - -def decode_24(opcode): - """ - Decodes a 24-bit ADSP-219x instruction into its assembly string. - """ - # Type 1: 11xxxxxx (Compute | DregX←DM | DregY←PM) - if (opcode >> 22) == 0b11: - pd = (opcode >> 20) & 0x3 - dd = (opcode >> 18) & 0x3 - amf = (opcode >> 13) & 0x1F - yop = (opcode >> 11) & 0x3 - xop = (opcode >> 8) & 0x7 - pmi = (opcode >> 6) & 0x3 - pmm = (opcode >> 4) & 0x3 - dmi = (opcode >> 2) & 0x3 - dmm = opcode & 0x3 - - # Check for NOP multifunction (All AMF bits zero) - if amf == 0: - comp_str = "NOP" - elif amf >= 0x10: - comp_str = f"{AMF_ALU[amf]}({XOP_ALU[xop]}, {YOP_ALU[yop]})" - else: - comp_str = f"{AMF_MAC[amf]}({XOP_MAC[xop]}, {YOP_MAC[yop]})" - - return f"{comp_str}, {XOP_ALU[dd]} = DM(I{dmi} += M{dmm}), {YOP_ALU[pd]} = PM(I{pmi+4} += M{pmm+4})" - - # Type 3: Register read/write to immediate 16-bit address - # Type 3 (Ireg/Mreg): 101 D addr16 IREG/MREG - if (opcode >> 21) == 0b101: - d = (opcode >> 20) & 0x1 - addr = (opcode >> 4) & 0xFFFF - reg_code = opcode & 0xF - reg_rgp = 1 if reg_code < 8 else 1 # Simple I/M mapping for type 3 - # In reality, Type 3 Ireg/Mreg uses a specific table. 0-7 are I0-I7, 8-15 are M0-M7. - reg_name = f"I{reg_code}" if reg_code < 8 else f"M{reg_code-8}" - if d: return f"DM(0x{addr:04X}) = {reg_name}" - else: return f"{reg_name} = DM(0x{addr:04X})" - - # Type 6: 0100 Dreg Data16 (Dreg = Data16) - if (opcode >> 20) == 0b0100: - data = (opcode >> 4) & 0xFFFF - dreg = opcode & 0xF - reg_name = get_reg_name(0, dreg) - return f"{reg_name} = 0x{data:04X}" - - # Type 10: 000110B addr13 COND (Jump relative) - if (opcode >> 19) == 0b00011: - type_bits = (opcode >> 17) & 0x7 - if type_bits == 0b110: # Type 10: 00011 0 delayed(B) ... - b = (opcode >> 16) & 0x1 - addr = (opcode >> 4) & 0x1FFF - cond = opcode & 0xF - db = " (DB)" if b else "" - cond_str = f"IF {COND_CODES[cond]} " if cond != 0xF else "" - return f"{cond_str}JUMP 0x{addr:04X}{db}" - elif type_bits == 0b100: # Type 12: Shift | Dreg ... - pass # TODO - - # Type 30: 00000000 (NOP) - if (opcode >> 12) == 0: - return "NOP" - - return f"UNKNOWN (0x{opcode:06X})" - -def main(): - if len(sys.argv) < 2: - print("Usage: adsp219x_disasm.py [3|4 (packed|padded)]") - return - - filename = sys.argv[1] - format = int(sys.argv[2]) if len(sys.argv) > 2 else 3 # Default 3-byte packed - - with open(filename, "rb") as f: - data = f.read() - - step = format - for i in range(0, len(data), step): - chunk = data[i:i+step] - if len(chunk) < 3: break - - if format == 3: - # Packed: B0 B1 B2 - opcode = (chunk[0] << 16) | (chunk[1] << 8) | chunk[2] - else: - # Padded 32-bit (assume leading zero or big-endian dump): 0x00 B0 B1 B2 - # or check your dump! - opcode = (chunk[1] << 16) | (chunk[2] << 8) | chunk[3] - - addr = i // format - print(f"0x{addr:04X}: 0x{opcode:06X} {decode_24(opcode)}") - -if __name__ == "__main__": - main() diff --git a/examples/isa_test.elf b/examples/isa_test.elf deleted file mode 100644 index 7041ab2..0000000 Binary files a/examples/isa_test.elf and /dev/null differ diff --git a/examples/isa_test.o b/examples/isa_test.o deleted file mode 100644 index 298f9d8..0000000 Binary files a/examples/isa_test.o and /dev/null differ diff --git a/r2plugin/r2_adsp219x.py b/r2plugin/r2_adsp219x.py deleted file mode 100644 index 8709622..0000000 --- a/r2plugin/r2_adsp219x.py +++ /dev/null @@ -1,13 +0,0 @@ -import r2pipe -import sys - -def adsp_disasm(hex_str): - """Simple bridge to our existing disasm logic""" - # For now, just return hex + architecture name as POC - return f"ADSP219x: {hex_str}" - -if __name__ == "__main__": - r2 = r2pipe.open() - # Register architecture via r2pipe hook - # Note: Modern r2 supports python-based asm plugins via 'L' (plugins) - print("ADSP219x Plugin loaded via r2pipe") diff --git a/testrom/gen_testrom.py b/testrom/gen_testrom.py deleted file mode 100644 index 886db6e..0000000 --- a/testrom/gen_testrom.py +++ /dev/null @@ -1,40 +0,0 @@ -import sys -import struct -import os - -# Opcode constants -TYPE1_NOP = 0xC00000 -TYPE6_AX0 = 0x400000 -TYPE10_JUMP_ALWAYS = 0x18000F -TYPE30_NOP = 0x000000 - -def create_rom(filename, format=3): - """ - Creates a synthetic ADSP-219x ROM with known instruction patterns. - """ - os.makedirs(os.path.dirname(filename), exist_ok=True) - instructions = [ - 0x000000, # 0x0000: NOP - 0x401230 | 0x0, # 0x0001: AX0 = 0x1234 (Type 6, simplified field) - 0x502000 | 0x0, # 0x0002: I0 = 0x2000 (Type 7) - 0x500010 | 0x4, # 0x0003: M0 = 1 (Type 7) - 0xC00000 | (0x13<<13) | (0x0<<11) | (0x0<<8) | (0x0<<2) | (0x0), - # 0x0004: X+Y, AX0=DM(I0+=M0), AY0=PM(I4+=M4) - 0x18010F, # 0x0005: JUMP 0x0100 - ] - - with open(filename, "wb") as f: - for ins in instructions: - if format == 3: - # Big-endian 3-byte pack - f.write(struct.pack(">I", ins)[1:]) - else: - # Big-endian 4-byte pad - f.write(struct.pack(">I", ins)) - -if __name__ == "__main__": - # Ensure full path to base_test.bin - base_dir = os.path.dirname(os.path.abspath(__file__)) - create_rom(os.path.join(base_dir, "test_roms/base_test.bin"), 3) - create_rom(os.path.join(base_dir, "test_roms/padded_test.bin"), 4) - print("Test ROMs generated in test_roms/") diff --git a/testrom/test_roms/base_test.bin b/testrom/test_roms/base_test.bin deleted file mode 100644 index 5545139..0000000 Binary files a/testrom/test_roms/base_test.bin and /dev/null differ diff --git a/testrom/test_roms/padded_test.bin b/testrom/test_roms/padded_test.bin deleted file mode 100644 index 36a2a10..0000000 Binary files a/testrom/test_roms/padded_test.bin and /dev/null differ