Get rid of the dupped ut8p macros

Author: radare

libr/arch/p/snes/plugin.c

@@ -48,9 +48,9 @@ static char *snes_disass(struct snes_asm_flags snesflags, ut64 pc, const ut8 *bu
 		if (*buf == 0x44 || *buf == 0x54) { // mvp and mvn
 			buf_asm = r_strf (s_op->name, buf[1], buf[2]);
 		} else if (*buf == 0x82) { // brl
-			buf_asm = r_strf (s_op->name, pc + 3 + (st16)ut8p_bw(buf + 1));
+			buf_asm = r_strf (s_op->name, pc + 3 + (st16)r_read_le16(buf + 1));
 		} else {
-			buf_asm = r_strf (s_op->name, ut8p_bw (buf + 1));
+			buf_asm = r_strf (s_op->name, r_read_le16 (buf + 1));
 		}
 		break;
 	case SNES_OP_32BIT:
@@ -60,14 +60,14 @@ static char *snes_disass(struct snes_asm_flags snesflags, ut64 pc, const ut8 *bu
 		if (M_flag) {
 			buf_asm = r_strf ("%s #0x%02x", s_op->name, buf[1]);
 		} else {
-			buf_asm = r_strf ("%s #0x%04x", s_op->name, ut8p_bw (buf + 1));
+			buf_asm = r_strf ("%s #0x%04x", s_op->name, r_read_le16 (buf + 1));
 		}
 		break;
 	case SNES_OP_IMM_X:
 		if (X_flag) {
 			buf_asm = r_strf ("%s #0x%02x", s_op->name, buf[1]);
 		} else {
-			buf_asm = r_strf ("%s #0x%04x", s_op->name, ut8p_bw (buf + 1));
+			buf_asm = r_strf ("%s #0x%04x", s_op->name, r_read_le16 (buf + 1));
 		}
 		break;
 	}
@@ -248,7 +248,7 @@ static bool snes_anop(RArchSession *as, RAnalOp *op, RArchDecodeMask mask) {
 		break;
 	case 0x4c: // jmp addr
 		op->eob = true;
-		op->jump = (addr & 0xFF0000) | ut8p_bw (data + 1);
+		op->jump = (addr & 0xFF0000) | r_read_le16 (data + 1);
 		op->type = R_ANAL_OP_TYPE_JMP;
 		break;
 	case 0x5c: // jmp long
@@ -263,7 +263,7 @@ static bool snes_anop(RArchSession *as, RAnalOp *op, RArchDecodeMask mask) {
 		break;
 	case 0x82: // brl
 		op->eob = true;
-		op->jump = addr + 3 + (st16)ut8p_bw (data + 1);
+		op->jump = addr + 3 + (st16)r_read_le16 (data + 1);
 		op->type = R_ANAL_OP_TYPE_JMP;
 		break;
 	case 0x6c: // jmp (addr)
@@ -298,7 +298,7 @@ static bool snes_anop(RArchSession *as, RAnalOp *op, RArchDecodeMask mask) {
 		op->type = R_ANAL_OP_TYPE_CJMP;
 		break;
 	case 0x20: // jsr addr
-		op->jump = (addr & 0xFF0000) | ut8p_bw (data+1);
+		op->jump = (addr & 0xFF0000) | r_read_le16 (data+1);
 		op->type = R_ANAL_OP_TYPE_CALL;
 		break;
 	case 0x22: // jsr long

libr/arch/p/snes/snesdis.c

@@ -28,9 +28,9 @@ static int snesDisass(int M_flag, int X_flag, ut64 pc, RAnalOp *op, const ut8 *b
 		if (*buf == 0x44 || *buf == 0x54) { // mvp and mvn
 			op->mnemonic = r_str_newf (s_op->name, buf[1], buf[2]);
 		} else if (*buf == 0x82) { // brl
-			op->mnemonic = r_str_newf (s_op->name, pc + 3 + (st16)ut8p_bw(buf + 1));
+			op->mnemonic = r_str_newf (s_op->name, pc + 3 + (st16)r_read_le16(buf + 1));
 		} else {
-			op->mnemonic = r_str_newf (s_op->name, ut8p_bw (buf + 1));
+			op->mnemonic = r_str_newf (s_op->name, r_read_le16 (buf + 1));
 		}
 		break;
 	case SNES_OP_32BIT:
@@ -40,14 +40,14 @@ static int snesDisass(int M_flag, int X_flag, ut64 pc, RAnalOp *op, const ut8 *b
 		if (M_flag) {
 			op->mnemonic = r_str_newf ("%s #0x%02x", s_op->name, buf[1]);
 		} else {
-			op->mnemonic = r_str_newf ("%s #0x%04x", s_op->name, ut8p_bw (buf + 1));
+			op->mnemonic = r_str_newf ("%s #0x%04x", s_op->name, r_read_le16 (buf + 1));
 		}
 		break;
 	case SNES_OP_IMM_X:
 		if (X_flag) {
 			op->mnemonic = r_str_newf ("%s #0x%02x", s_op->name, buf[1]);
 		} else {
-			op->mnemonic = r_str_newf ("%s #0x%04x", s_op->name, ut8p_bw (buf + 1));
+			op->mnemonic = r_str_newf ("%s #0x%04x", s_op->name, r_read_le16 (buf + 1));
 		}
 		break;
 	}

libr/bin/format/omf/omf.c

@@ -30,7 +30,7 @@ bool r_bin_checksum_omf_ok(const ut8 *buf, ut64 buf_size) {
 		eprintf ("Invalid record (too short)\n");
 		return false;
 	}
-	size = ut8p_bw (buf + 1);
+	size = r_read_le16 (buf + 1);
 	if (buf_size < size + 3) {
 		eprintf ("Invalid record (too short)\n");
 		return false;

libr/include/r_endian.h

@@ -390,14 +390,6 @@ static inline void r_write_ble(void *dst, ut64 val, bool be, int size) {
 	}
 }
 
-// TODO: find better names and write vapis
-#define ut8p_b(x) ((x)[0])
-#define ut8p_bw(x) ((x)[0]|((x)[1]<<8))
-#define ut8p_bd(x) ((x)[0]|((x)[1]<<8)|((x)[2]<<16)|((x)[3]<<24))
-#define ut8p_bq(x) ((x)[0]|((x)[1]<<8)|((x)[2]<<16)|((x)[3]<<24)|((x)[4]<<32)|((x)[5]<<40)|((x)[6]<<48)|((x)[7]<<56))
-#define ut8p_lw(x) ((x)[1]|((x)[0]<<8))
-#define ut8p_ld(x) ((x)[3]|((x)[2]<<8)|((x)[1]<<16)|((x)[0]<<24))
-#define ut8p_lq(x) ((x)[7]|((x)[6]<<8)|((x)[5]<<16)|((x)[4]<<24)|((x)[3]<<32)|((x)[2]<<40)|((x)[1]<<48)|((x)[0]<<56))
 
 /*swap*/
 static inline ut16 r_swap_ut16(ut16 val) {