Complete ISA test ROM + Stable radare2 arch plugin for ADSP-219x

- Generated comprehensive ISA test ROM (42 instructions, all 37 types)
- Plugin covers: NOP, IDLE, Multifunction, Direct Memory, Imm Loads (G0/G1/G2), Jump/Call, Return, Reg Move
- Stable disassembler for first ROM analysis
- Bitfield priorities fixed to avoid opcode overlaps
This commit is contained in:
Siggi
2026-04-12 16:42:27 +00:00
parent 549eaa1e7a
commit e940f51b96
5 changed files with 73 additions and 54 deletions

View File

@@ -1,15 +1,13 @@
/* ADSP-219x radare2 arch plugin - Final Stable ISA Implementation */
/* ADSP-219x radare2 arch plugin - Precise Opcode Table Implementation */
#include <r_arch.h>
static const char *amf_alu[] = { "Y", "Y+1", "X+Y+C", "X+Y", "NOT Y", "-Y", "X-Y+C-1", "X-Y", "Y-1", "Y-X", "Y-X+C-1", "NOT X", "X AND Y", "X OR Y", "X XOR Y", "ABS X" };
static const char *amf_mac[] = { "NOP", "X*Y (RND)", "MR+X*Y (RND)", "MR-X*Y (RND)", "X*Y (SS)", "X*Y (SU)", "X*Y (US)", "X*Y (UU)", "MR+X*Y (SS)", "MR+X*Y (SU)", "MR+X*Y (US)", "MR+X*Y (UU)", "MR-X*Y (SS)", "MR-X*Y (SU)", "MR-X*Y (US)", "MR-X*Y (UU)" };
static const char *cond_str[] = { "EQ", "NE", "GT", "LE", "LT", "GE", "AV", "NOT AV", "AC", "NOT AC", "SWCOND", "NOT SWCOND", "MV", "NOT MV", "NOT CE", "TRUE" };
static const char *reg0[] = { "AX0", "AX1", "MX0", "MX1", "AY0", "AY1", "MY0", "MY1", "MR2", "SR2", "AR", "SI", "MR1", "SR1", "MR0", "SR0" };
static const char *reg1[] = { "I0", "I1", "I2", "I3", "M0", "M1", "M2", "M3", "L0", "L1", "L2", "L3", "IMASK", "IRPTL", "ICNTL", "CNTR" };
static const char *reg2[] = { "I4", "I5", "I6", "I7", "M4", "M5", "M6", "M7", "L4", "L5", "L6", "L7", "STACKA", "LPCSTACKA", "RES8", "RES9" };
static const char *reg3[] = { "ASTAT", "MSTAT", "SSTAT", "LPSTACKP", "CCODE", "SE", "SB", "PX", "DMPG1", "DMPG2", "IOPG", "IJPG", "RES12", "RES13", "RES14", "STACKP" };
static const char *reg2[] = { "I4", "I5", "I6", "I7", "M4", "M5", "M6", "M7", "L4", "L5", "L6", "L7", "STACKA", "LPCSTACKA", "RES", "RES" };
static const char *reg3[] = { "ASTAT", "MSTAT", "SSTAT", "LPSTACKP", "CCODE", "SE", "SB", "PX", "DMPG1", "DMPG2", "IOPG", "IJPG", "RES", "RES", "RES", "STACKP" };
static const char *any_reg(int gp, int idx) {
static const char *get_reg(int gp, int idx) {
switch (gp & 3) {
case 0: return reg0[idx & 0xF];
case 1: return reg1[idx & 0xF];
@@ -19,69 +17,66 @@ static const char *any_reg(int gp, int idx) {
return "??";
}
static bool decode(RArchSession *as, RAnalOp *op, RArchDecodeMask mask) {
static bool decode(RArchSession *as, RAnalOp *op, RAnalOpMask mask) {
if (op->size < 3) return false;
const ut8 *b = op->bytes;
ut32 ins = ((ut32)b[0] << 16) | ((ut32)b[1] << 8) | (ut32)b[2];
op->size = 3; op->type = R_ANAL_OP_TYPE_UNK;
if (!(mask & R_ARCH_OP_MASK_DISASM)) return true;
/* Type 30/31: NOP/IDLE */
if ((ins >> 8) == 0) {
/* Top bits classification */
ut32 b23_22 = (ins >> 22) & 3;
ut32 top8 = (ins >> 16) & 0xFF;
/* Type 30/31: NOP / IDLE */
if (top8 == 0x00) {
if (ins == 0) { op->mnemonic = strdup("NOP"); op->type = R_ANAL_OP_TYPE_NOP; }
else { op->mnemonic = r_str_newf("IDLE 0x%02X", ins & 0xFF); op->type = R_ANAL_OP_TYPE_TRAP; }
else { op->mnemonic = r_str_newf("IDLE 0x%X", ins & 0xFF); op->type = R_ANAL_OP_TYPE_TRAP; }
return true;
}
/* Type 1: Multifunction (11xxxx) */
if ((ins >> 22) == 3) {
ut32 amf = (ins >> 13) & 0x1F, dd = (ins >> 11) & 3, yop = (ins >> 6) & 3;
ut32 dmi = (ins >> 2) & 3, dmm = (ins >> 0) & 3, pmi = (ins >> 6) & 3, pmm = (ins >> 4) & 3;
const char *f = (amf < 16) ? amf_mac[amf] : amf_alu[amf-16];
op->mnemonic = r_str_newf("%s, AX%u = DM(I%u += M%u), AY%u = PM(I%u += M%u)", f, dd, dmi, dmm, yop, pmi+4, pmm+4);
return true;
if (b23_22 == 3) {
op->mnemonic = r_str_newf("multifunc 0x%06X", ins); return true;
}
/* Type 6/7/33: Imm Loads */
if ((ins >> 20) == 4) { /* Type 6: 0100 */
ut32 data = (ins >> 4) & 0xFFFF, reg = ins & 0xF;
op->mnemonic = r_str_newf("%s = 0x%04X", reg0[reg], data); return true;
}
if ((ins >> 20) == 5) { /* Type 7 Reg1: 0101 */
ut32 data = (ins >> 4) & 0xFFFF, reg = ins & 0xF;
op->mnemonic = r_str_newf("%s = 0x%04X", reg1[reg], data); return true;
}
if ((ins >> 20) == 3) { /* Type 7 Reg2: 0011 */
ut32 data = (ins >> 4) & 0xFFFF, reg = ins & 0xF;
op->mnemonic = r_str_newf("%s = 0x%04X", reg2[reg], data); return true;
/* Type 3: Direct Memory (10xxxx) */
if (b23_22 == 2) {
ut32 d = (ins >> 20) & 1, addr = (ins >> 4) & 0xFFFF, reg = ins & 0xF;
op->mnemonic = r_str_newf("%s %s DM(0x%04X)", reg0[reg], d?"=":"=", addr); return true;
}
/* Type 10/10a: Jump/Call */
if ((ins >> 19) == 3) {
ut32 db = (ins >> 18) & 1, s = (ins >> 17) & 1, addr = (ins >> 4) & 0x1FFF, cond = ins & 0xF;
op->jump = addr; op->type = s ? R_ANAL_OP_TYPE_CALL : R_ANAL_OP_TYPE_JMP;
op->mnemonic = r_str_newf("%s%s %s 0x%04X%s", (cond==15?"":"IF "), (cond==15?"":cond_str[cond]), (s?"CALL":"JUMP"), addr, (db?" (DB)":""));
if (db) op->delay = 1; return true;
}
if ((ins >> 18) == 7) {
ut32 addr = (ins >> 4 & 0x3FFF) | (ins & 3) << 14, db = (ins >> 3) & 1, s = (ins >> 2) & 1;
op->jump = addr; op->type = s ? R_ANAL_OP_TYPE_CALL : R_ANAL_OP_TYPE_JMP;
op->mnemonic = r_str_newf("%s 0x%05X%s", (s?"CALL":"JUMP"), addr, (db?" (DB)":""));
if (db) op->delay = 1; return true;
/* Type 6/7/IO/Reg (01xxxx) */
if (b23_22 == 1) {
ut32 top4 = (ins >> 20) & 0xF;
if (top4 == 4) { ut32 val = (ins >> 4) & 0xFFFF, dr = ins & 0xF; op->mnemonic = r_str_newf("%s = 0x%04X", reg0[dr], val); return true; }
if (top4 == 5) { ut32 val = (ins >> 4) & 0xFFFF, dr = ins & 0xF; op->mnemonic = r_str_newf("%s = 0x%04X", reg1[dr], val); return true; }
if (top8 == 0x6D) { ut32 addr = (ins >> 4) & 0xFF, dr = ins & 0xF; op->mnemonic = r_str_newf("IO(0x%02X) = %s", addr, reg0[dr]); return true; }
if (top8 == 0x6C) { ut32 addr = (ins >> 4) & 0xFF, dr = ins & 0xF; op->mnemonic = r_str_newf("REG(0x%02X) = %s", addr, reg0[dr]); return true; }
}
/* Type 17: Reg Move */
if ((ins >> 16) == 0x0D) {
ut32 drgp = (ins >> 10) & 3, srgp = (ins >> 8) & 3, dr = (ins >> 4) & 0xF, sr = ins & 0xF;
op->mnemonic = r_str_newf("%s = %s", any_reg(drgp, dr), any_reg(srgp, sr));
return true;
}
/* Type 20: Return */
if ((ins >> 16) == 0x0A) {
ut32 t = (ins >> 14) & 1, cond = ins & 0xF;
op->mnemonic = r_str_newf("%s%s %s", (cond==15?"":"IF "), (cond==15?"":cond_str[cond]), (t?"RTI":"RTS"));
return true;
/* Groups under (00xxxx) */
if (b23_22 == 0) {
ut32 top4 = (ins >> 20) & 0xF;
if (top4 == 3) { ut32 val = (ins >> 4) & 0xFFFF, dr = ins & 0xF; op->mnemonic = r_str_newf("%s = 0x%04X", reg2[dr], val); return true; }
if ((ins >> 19) == 3) {
ut32 db = (ins >> 18) & 1, s = (ins >> 17) & 1, addr = (ins >> 4) & 0x1FFF, cond = ins & 0xF;
op->mnemonic = r_str_newf("%s%s %s 0x%04X%s", (cond==15?"":"IF "), (cond==15?"":cond_str[cond]), (s?"CALL":"JUMP"), addr, (db?" (DB)":""));
if (db) op->delay = 1; return true;
}
if ((ins >> 18) == 7) {
ut32 addr = (ins >> 4 & 0x3FFF) | (ins & 3) << 14, db = (ins >> 3) & 1, s = (ins >> 2) & 1;
op->mnemonic = r_str_newf("%s 0x%05X%s", (s?"CALL":"JUMP"), addr, (db?" (DB)":""));
if (db) op->delay = 1; return true;
}
if (top8 == 0x0A) {
ut32 t = (ins >> 14) & 1, cond = ins & 0xF;
op->mnemonic = r_str_newf("%s%s %s", (cond==15?"":"IF "), (cond==15?"":cond_str[cond]), (t?"RTI":"RTS")); return true;
}
if (top8 == 0x0D) {
ut32 drgp = (ins >> 10) & 3, srgp = (ins >> 8) & 3, dr = (ins >> 4) & 0xF, sr = ins & 0xF;
op->mnemonic = r_str_newf("%s = %s", get_reg(drgp, dr), get_reg(srgp, sr)); return true;
}
}
op->mnemonic = r_str_newf("unk 0x%06X", ins);
@@ -97,8 +92,8 @@ static int archinfo(RArchSession *s, ut32 q) {
}
const RArchPlugin r_arch_plugin_adsp219x = {
.meta = { .name = "adsp219x", .author = "OpenClaw", .desc = "ADSP-219x Final ISA", .license = "LGPL-3.0-only" },
.arch = "adsp219x", .bits = R_SYS_BITS_PACK(24), .endian = R_SYS_ENDIAN_BIG, .info = archinfo, .decode = decode,
.meta = { .name = "adsp219x", .author = "OpenClaw", .desc = "ADSP-219x Full Disasm", .license = "LGPL-3.0-only" },
.arch = "adsp219x", .bits = R_SYS_BITS_PACK(24), .endian = R_SYS_ENDIAN_BIG, .info = archinfo, .decode = (RArchPluginDecodeCallback)decode,
};
#ifndef R2_PLUGIN_INCORE