From 41eb3808c1c7fede87f2a80b2fa2837b9575ed50 Mon Sep 17 00:00:00 2001 From: "Ilya V. Matveychikov" Date: Thu, 6 Feb 2014 12:50:25 +0400 Subject: [PATCH] TMS320: move c55x+ to C55X_PLUS namespace --- libr/anal/p/anal_tms320.c | 4 ++-- ..._tms320_c55plus.c => anal_tms320_c55x_plus.c} | 2 +- libr/anal/p/tms320.mk | 16 ++++++++-------- .../arch/tms320/{c55plus => c55x_plus}/c55plus.c | 2 +- .../arch/tms320/{c55plus => c55x_plus}/c55plus.h | 2 +- .../arch/tms320/{c55plus => c55x_plus}/decode.c | 0 .../arch/tms320/{c55plus => c55x_plus}/decode.h | 0 .../tms320/{c55plus => c55x_plus}/decode_funcs.c | 0 .../tms320/{c55plus => c55x_plus}/decode_funcs.h | 0 .../tms320/{c55plus => c55x_plus}/hashtable.c | 0 .../tms320/{c55plus => c55x_plus}/hashtable.h | 0 .../tms320/{c55plus => c55x_plus}/hashvector.c | 0 .../tms320/{c55plus => c55x_plus}/hashvector.h | 0 .../asm/arch/tms320/{c55plus => c55x_plus}/ins.c | 0 .../asm/arch/tms320/{c55plus => c55x_plus}/ins.h | 0 .../arch/tms320/{c55plus => c55x_plus}/utils.c | 0 .../arch/tms320/{c55plus => c55x_plus}/utils.h | 0 libr/asm/arch/tms320/tms320_dasm.c | 6 +++--- libr/asm/arch/tms320/tms320_dasm.h | 2 +- libr/asm/p/asm_tms320.c | 2 +- libr/asm/p/tms320.mk | 14 +++++++------- 21 files changed, 25 insertions(+), 25 deletions(-) rename libr/anal/p/{anal_tms320_c55plus.c => anal_tms320_c55x_plus.c} (96%) rename libr/asm/arch/tms320/{c55plus => c55x_plus}/c55plus.c (92%) rename libr/asm/arch/tms320/{c55plus => c55x_plus}/c55plus.h (71%) rename libr/asm/arch/tms320/{c55plus => c55x_plus}/decode.c (100%) rename libr/asm/arch/tms320/{c55plus => c55x_plus}/decode.h (100%) rename libr/asm/arch/tms320/{c55plus => c55x_plus}/decode_funcs.c (100%) rename libr/asm/arch/tms320/{c55plus => c55x_plus}/decode_funcs.h (100%) rename libr/asm/arch/tms320/{c55plus => c55x_plus}/hashtable.c (100%) rename libr/asm/arch/tms320/{c55plus => c55x_plus}/hashtable.h (100%) rename libr/asm/arch/tms320/{c55plus => c55x_plus}/hashvector.c (100%) rename libr/asm/arch/tms320/{c55plus => c55x_plus}/hashvector.h (100%) rename libr/asm/arch/tms320/{c55plus => c55x_plus}/ins.c (100%) rename libr/asm/arch/tms320/{c55plus => c55x_plus}/ins.h (100%) rename libr/asm/arch/tms320/{c55plus => c55x_plus}/utils.c (100%) rename libr/asm/arch/tms320/{c55plus => c55x_plus}/utils.h (100%) diff --git a/libr/anal/p/anal_tms320.c b/libr/anal/p/anal_tms320.c index 4e39a405bd..566596b0b7 100644 --- a/libr/anal/p/anal_tms320.c +++ b/libr/anal/p/anal_tms320.c @@ -14,7 +14,7 @@ typedef int (* anal_op_t)(RAnal *, RAnalOp *, ut64, ut8 *, int); int tms320_c54x_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len); int tms320_c55x_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len); -int tms320_c55plus_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len); +int tms320_c55x_plus_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len); int tms320_c54x_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len) { @@ -37,7 +37,7 @@ int tms320_op(RAnal * anal, RAnalOp * op, ut64 addr, const ut8 * buf, int len) if (anal->cpu && strcasecmp(anal->cpu, "c55x") == 0) aop = tms320_c55x_op; if (anal->cpu && strcasecmp(anal->cpu, "c55x+") == 0) - aop = tms320_c55plus_op; + aop = tms320_c55x_plus_op; return aop(anal, op, addr, buf, len); } diff --git a/libr/anal/p/anal_tms320_c55plus.c b/libr/anal/p/anal_tms320_c55x_plus.c similarity index 96% rename from libr/anal/p/anal_tms320_c55plus.c rename to libr/anal/p/anal_tms320_c55x_plus.c index 18d49a5125..5a9b8ad07d 100644 --- a/libr/anal/p/anal_tms320_c55plus.c +++ b/libr/anal/p/anal_tms320_c55x_plus.c @@ -8,7 +8,7 @@ ut32 get_ins_len(ut8 opcode); -int tms320_c55plus_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len) { +int tms320_c55x_plus_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len) { ut16 *ins = (ut16*)buf; ut32 ins_len; diff --git a/libr/anal/p/tms320.mk b/libr/anal/p/tms320.mk index 16394e290f..62e4d9a75f 100644 --- a/libr/anal/p/tms320.mk +++ b/libr/anal/p/tms320.mk @@ -1,17 +1,17 @@ OBJ_TMS320=anal_tms320.o -OBJ_TMS320+=anal_tms320_c55plus.o +OBJ_TMS320+=anal_tms320_c55x_plus.o STATIC_OBJ+=${OBJ_TMS320} #OBJ_TMS320+=../../../../../../../../../../../${LTOP}/asm/arch/tms320/tms320_dasm.o ROOT=../../../../../../../../../../../../../../../../../../../../../ OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/tms320_dasm.o -OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55plus/ins.o -OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55plus/c55plus.o -OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55plus/decode.o -OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55plus/decode_funcs.o -OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55plus/utils.o -OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55plus/hashtable.o -OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55plus/hashvector.o +OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55x_plus/ins.o +OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55x_plus/c55plus.o +OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55x_plus/decode.o +OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55x_plus/decode_funcs.o +OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55x_plus/utils.o +OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55x_plus/hashtable.o +OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55x_plus/hashvector.o TARGET_TMS320=anal_tms320.${EXT_SO} ALL_TARGETS+=${TARGET_TMS320} diff --git a/libr/asm/arch/tms320/c55plus/c55plus.c b/libr/asm/arch/tms320/c55x_plus/c55plus.c similarity index 92% rename from libr/asm/arch/tms320/c55plus/c55plus.c rename to libr/asm/arch/tms320/c55x_plus/c55plus.c index c55d6c14d8..b93318a3f1 100644 --- a/libr/asm/arch/tms320/c55plus/c55plus.c +++ b/libr/asm/arch/tms320/c55x_plus/c55plus.c @@ -17,7 +17,7 @@ extern ut8 *ins_buff; extern ut32 ins_buff_len; -int c55plus_disassemble(tms320_dasm_t *dasm, const ut8 *buf, int len) { +int c55x_plus_disassemble(tms320_dasm_t *dasm, const ut8 *buf, int len) { unsigned int next_ins_pos; char *ins_decoded; size_t i, ins_decoded_len; diff --git a/libr/asm/arch/tms320/c55plus/c55plus.h b/libr/asm/arch/tms320/c55x_plus/c55plus.h similarity index 71% rename from libr/asm/arch/tms320/c55plus/c55plus.h rename to libr/asm/arch/tms320/c55x_plus/c55plus.h index 4e1732d593..32d6a704d3 100644 --- a/libr/asm/arch/tms320/c55plus/c55plus.h +++ b/libr/asm/arch/tms320/c55x_plus/c55plus.h @@ -10,6 +10,6 @@ #include "../tms320_p.h" #include "../tms320_dasm.h" -extern int c55plus_disassemble(tms320_dasm_t *dasm, const ut8 *buf, int len); +extern int c55x_plus_disassemble(tms320_dasm_t *dasm, const ut8 *buf, int len); #endif diff --git a/libr/asm/arch/tms320/c55plus/decode.c b/libr/asm/arch/tms320/c55x_plus/decode.c similarity index 100% rename from libr/asm/arch/tms320/c55plus/decode.c rename to libr/asm/arch/tms320/c55x_plus/decode.c diff --git a/libr/asm/arch/tms320/c55plus/decode.h b/libr/asm/arch/tms320/c55x_plus/decode.h similarity index 100% rename from libr/asm/arch/tms320/c55plus/decode.h rename to libr/asm/arch/tms320/c55x_plus/decode.h diff --git a/libr/asm/arch/tms320/c55plus/decode_funcs.c b/libr/asm/arch/tms320/c55x_plus/decode_funcs.c similarity index 100% rename from libr/asm/arch/tms320/c55plus/decode_funcs.c rename to libr/asm/arch/tms320/c55x_plus/decode_funcs.c diff --git a/libr/asm/arch/tms320/c55plus/decode_funcs.h b/libr/asm/arch/tms320/c55x_plus/decode_funcs.h similarity index 100% rename from libr/asm/arch/tms320/c55plus/decode_funcs.h rename to libr/asm/arch/tms320/c55x_plus/decode_funcs.h diff --git a/libr/asm/arch/tms320/c55plus/hashtable.c b/libr/asm/arch/tms320/c55x_plus/hashtable.c similarity index 100% rename from libr/asm/arch/tms320/c55plus/hashtable.c rename to libr/asm/arch/tms320/c55x_plus/hashtable.c diff --git a/libr/asm/arch/tms320/c55plus/hashtable.h b/libr/asm/arch/tms320/c55x_plus/hashtable.h similarity index 100% rename from libr/asm/arch/tms320/c55plus/hashtable.h rename to libr/asm/arch/tms320/c55x_plus/hashtable.h diff --git a/libr/asm/arch/tms320/c55plus/hashvector.c b/libr/asm/arch/tms320/c55x_plus/hashvector.c similarity index 100% rename from libr/asm/arch/tms320/c55plus/hashvector.c rename to libr/asm/arch/tms320/c55x_plus/hashvector.c diff --git a/libr/asm/arch/tms320/c55plus/hashvector.h b/libr/asm/arch/tms320/c55x_plus/hashvector.h similarity index 100% rename from libr/asm/arch/tms320/c55plus/hashvector.h rename to libr/asm/arch/tms320/c55x_plus/hashvector.h diff --git a/libr/asm/arch/tms320/c55plus/ins.c b/libr/asm/arch/tms320/c55x_plus/ins.c similarity index 100% rename from libr/asm/arch/tms320/c55plus/ins.c rename to libr/asm/arch/tms320/c55x_plus/ins.c diff --git a/libr/asm/arch/tms320/c55plus/ins.h b/libr/asm/arch/tms320/c55x_plus/ins.h similarity index 100% rename from libr/asm/arch/tms320/c55plus/ins.h rename to libr/asm/arch/tms320/c55x_plus/ins.h diff --git a/libr/asm/arch/tms320/c55plus/utils.c b/libr/asm/arch/tms320/c55x_plus/utils.c similarity index 100% rename from libr/asm/arch/tms320/c55plus/utils.c rename to libr/asm/arch/tms320/c55x_plus/utils.c diff --git a/libr/asm/arch/tms320/c55plus/utils.h b/libr/asm/arch/tms320/c55x_plus/utils.h similarity index 100% rename from libr/asm/arch/tms320/c55plus/utils.h rename to libr/asm/arch/tms320/c55x_plus/utils.h diff --git a/libr/asm/arch/tms320/tms320_dasm.c b/libr/asm/arch/tms320/tms320_dasm.c index b0850712bb..29b116f270 100644 --- a/libr/asm/arch/tms320/tms320_dasm.c +++ b/libr/asm/arch/tms320/tms320_dasm.c @@ -20,7 +20,7 @@ #include "tms320_p.h" #include "tms320_dasm.h" -#include "c55plus/c55plus.h" +#include "c55x_plus/c55plus.h" /* * TMS320 disassembly engine implementation @@ -1003,13 +1003,13 @@ int tms320_dasm(tms320_dasm_t * dasm, const ut8 * stream, int len) { init_dasm(dasm, stream, len); - if (tms320_f_get_cpu(dasm) != TMS320_F_CPU_C55PLUS) { + if (tms320_f_get_cpu(dasm) != TMS320_F_CPU_C55X_PLUS) { if (lookup_insn_head(dasm) && decode_insn_head(dasm)) { if (dasm->length > len) dasm->status |= TMS320_S_INVAL; } } else { - c55plus_disassemble(dasm, stream, len); + c55x_plus_disassemble(dasm, stream, len); } return dasm->status & TMS320_S_INVAL ? 0 : dasm->length; diff --git a/libr/asm/arch/tms320/tms320_dasm.h b/libr/asm/arch/tms320/tms320_dasm.h index 97591d1df4..16d08dbf7d 100644 --- a/libr/asm/arch/tms320/tms320_dasm.h +++ b/libr/asm/arch/tms320/tms320_dasm.h @@ -204,7 +204,7 @@ typedef struct { #define TMS320_F_CPU_C54X 0x0000001 #define TMS320_F_CPU_C55X 0x0000002 -#define TMS320_F_CPU_C55PLUS 0x0000003 +#define TMS320_F_CPU_C55X_PLUS 0x0000003 #define TMS320_F_CPU_MASK 0x00000FF ut32 features; #define tms320_f_get_cpu(d) ((d)->features & TMS320_F_CPU_MASK) diff --git a/libr/asm/p/asm_tms320.c b/libr/asm/p/asm_tms320.c index a9efca5d25..a5ca1ae204 100644 --- a/libr/asm/p/asm_tms320.c +++ b/libr/asm/p/asm_tms320.c @@ -23,7 +23,7 @@ static int tms320_disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len) if (a->cpu && strcasecmp(a->cpu, "c55x") == 0) tms320_f_set_cpu(&engine, TMS320_F_CPU_C55X); if (a->cpu && strcasecmp(a->cpu, "c55x+") == 0) - tms320_f_set_cpu(&engine, TMS320_F_CPU_C55PLUS); + tms320_f_set_cpu(&engine, TMS320_F_CPU_C55X_PLUS); op->size = tms320_dasm(&engine, buf, len); snprintf(op->buf_asm, R_ASM_BUFSIZE, "%s", op->size ? engine.syntax : "invalid"); diff --git a/libr/asm/p/tms320.mk b/libr/asm/p/tms320.mk index 2778bb25d0..0302a7989d 100644 --- a/libr/asm/p/tms320.mk +++ b/libr/asm/p/tms320.mk @@ -3,13 +3,13 @@ OBJ_TMS320+=../arch/tms320/tms320_dasm.o # looks ugly as radare2 build system is terrible -OBJ_TMS320+=../arch/tms320/c55plus/c55plus.o \ - ../arch/tms320/c55plus/decode.o \ - ../arch/tms320/c55plus/decode_funcs.o \ - ../arch/tms320/c55plus/hashtable.o \ - ../arch/tms320/c55plus/hashvector.o \ - ../arch/tms320/c55plus/ins.o \ - ../arch/tms320/c55plus/utils.o +OBJ_TMS320+=../arch/tms320/c55x_plus/c55plus.o \ + ../arch/tms320/c55x_plus/decode.o \ + ../arch/tms320/c55x_plus/decode_funcs.o \ + ../arch/tms320/c55x_plus/hashtable.o \ + ../arch/tms320/c55x_plus/hashvector.o \ + ../arch/tms320/c55x_plus/ins.o \ + ../arch/tms320/c55x_plus/utils.o STATIC_OBJ+=${OBJ_TMS320} TARGET_TMS320=asm_tms320.${EXT_SO}