Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

score: Use util::sext for sign extension

Browse Source
This commit is contained in:
AJR 2022-11-20 20:39:11 -05:00
parent a2a06f2960
commit a46cb37f02
4 changed files with 36 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/devices/cpu/score/score.cpp
View File

@ -272,13 +272,6 @@ bool score7_cpu_device::check_condition(uint8_t bc)
return false;
}
int32_t score7_cpu_device::sign_extend(uint32_t data, uint8_t len)
{
data &= (1ULL << len) - 1;
uint32_t sign = 1 << (len - 1);
return (data ^ sign) - sign;
}
uint32_t score7_cpu_device::fetch()
{
return m_cache.read_dword(m_pc & ~3);
@ -580,7 +573,7 @@ void score7_cpu_device::op_specialform()
m_gpr[rd] = r;
break;
case 0x1b: // sra
r = sign_extend(m_gpr[ra] >> (m_gpr[rb] & 0x1f), 32 - (m_gpr[rb] & 0x1f));
r = util::sext(m_gpr[ra] >> (m_gpr[rb] & 0x1f), 32 - (m_gpr[rb] & 0x1f));
if (cu)
{
CHECK_Z(r);
@ -603,18 +596,14 @@ void score7_cpu_device::op_specialform()
break;
case 0x20: // mul
{
int64_t a = (int32_t)m_gpr[ra];
int64_t b = (int32_t)m_gpr[rb];
uint64_t d = a * b;
uint64_t d = mul_32x32(m_gpr[ra], m_gpr[rb]);
REG_CEL = d & 0xffffffff;
REG_CEH = (d >> 32) & 0xffffffff;
break;
}
case 0x21: // mulu
{
uint64_t a = (uint32_t)m_gpr[ra];
uint64_t b = (uint32_t)m_gpr[rb];
uint64_t d = a * b;
uint64_t d = mulu_32x32(m_gpr[ra], m_gpr[rb]);
REG_CEL = d & 0xffffffff;
REG_CEH = (d >> 32) & 0xffffffff;
break;
@ -682,7 +671,7 @@ void score7_cpu_device::op_specialform()
break;
case 0x2c: // extsb
case 0x2d: // extsh
m_gpr[rd] = sign_extend(m_gpr[ra], (GET_S_FUNC6(m_op) & 1) ? 16 : 8);
m_gpr[rd] = util::sext(m_gpr[ra], (GET_S_FUNC6(m_op) & 1) ? 16 : 8);
if (cu)
{
CHECK_N(m_gpr[rd]);
@ -737,7 +726,7 @@ void score7_cpu_device::op_specialform()
m_gpr[rd] = r;
break;
case 0x3b: // srai
r = sign_extend(m_gpr[ra] >> rb, 32 - rb);
r = util::sext(m_gpr[ra] >> rb, 32 - rb);
if (cu)
{
CHECK_Z(r);
@ -767,7 +756,7 @@ void score7_cpu_device::op_iform1()
{
uint8_t rd = GET_I_RD(m_op);
uint32_t imm16 = GET_I_IMM16(m_op);
int32_t simm16 = sign_extend(imm16, 16);
int32_t simm16 = util::sext(imm16, 16);
uint8_t cu = GET_I_CU(m_op);
uint32_t r;
@ -832,7 +821,7 @@ void score7_cpu_device::op_rixform1()
uint8_t rd = GET_RIX_RD(m_op);
// pre-increment
m_gpr[ra] += sign_extend(GET_RIX_IMM12(m_op), 12);
m_gpr[ra] += util::sext(GET_RIX_IMM12(m_op), 12);
switch(GET_RIX_FUNC3(m_op))
{
@ -840,13 +829,13 @@ void score7_cpu_device::op_rixform1()
m_gpr[rd] = read_dword(m_gpr[ra]);
break;
case 1: // lh
m_gpr[rd] = sign_extend(read_word(m_gpr[ra]), 16);
m_gpr[rd] = util::sext(read_word(m_gpr[ra]), 16);
break;
case 2: // lhu
m_gpr[rd] = read_word(m_gpr[ra]);
break;
case 3: // lb
m_gpr[rd] = sign_extend(read_byte(m_gpr[ra]), 8);
m_gpr[rd] = util::sext(read_byte(m_gpr[ra]), 8);
break;
case 4: // sw
write_dword(m_gpr[ra], m_gpr[rd]);
@ -867,7 +856,7 @@ void score7_cpu_device::op_branch()
{
if (check_condition_branch(GET_BC_BC(m_op)))
{
int32_t disp = sign_extend(GET_BC_DISP19(m_op), 19) << 1;
int32_t disp = util::sext(GET_BC_DISP19(m_op), 19) << 1;
if (GET_BC_LK(m_op))
REG_LNK = m_pc;
@ -971,13 +960,13 @@ void score7_cpu_device::op_rixform2()
m_gpr[rd] = read_dword(m_gpr[ra]);
break;
case 1: // lh
m_gpr[rd] = sign_extend(read_word(m_gpr[ra]), 16);
m_gpr[rd] = util::sext(read_word(m_gpr[ra]), 16);
break;
case 2: // lhu
m_gpr[rd] = read_word(m_gpr[ra]);
break;
case 3: // lb
m_gpr[rd] = sign_extend(read_byte(m_gpr[ra]), 8);
m_gpr[rd] = util::sext(read_byte(m_gpr[ra]), 8);
break;
case 4: // sw
write_dword(m_gpr[ra], m_gpr[rd]);
@ -994,14 +983,14 @@ void score7_cpu_device::op_rixform2()
}
// post-increment
m_gpr[ra] += sign_extend(GET_RIX_IMM12(m_op), 12);
m_gpr[ra] += util::sext(GET_RIX_IMM12(m_op), 12);
}
void score7_cpu_device::op_addri()
{
uint8_t ra = GET_RI_RA(m_op);
uint8_t rd = GET_RI_RD(m_op);
int32_t simm14 = sign_extend(GET_RI_IMM14(m_op), 14);
int32_t simm14 = util::sext(GET_RI_IMM14(m_op), 14);
uint8_t cu = GET_RI_CU(m_op);
uint32_t r = m_gpr[ra] + simm14;
@ -1049,7 +1038,7 @@ void score7_cpu_device::op_lw()
{
uint8_t rd = GET_LS_RD(m_op);
uint8_t ra = GET_LS_RA(m_op);
int32_t simm15 = sign_extend(GET_LS_IMM15(m_op), 15);
int32_t simm15 = util::sext(GET_LS_IMM15(m_op), 15);
m_gpr[rd] = read_dword(m_gpr[ra] + simm15);
}
@ -1058,16 +1047,16 @@ void score7_cpu_device::op_lh()
{
uint8_t rd = GET_LS_RD(m_op);
uint8_t ra = GET_LS_RA(m_op);
int32_t simm15 = sign_extend(GET_LS_IMM15(m_op), 15);
int32_t simm15 = util::sext(GET_LS_IMM15(m_op), 15);
m_gpr[rd] = sign_extend(read_word(m_gpr[ra] + simm15), 16);
m_gpr[rd] = util::sext(read_word(m_gpr[ra] + simm15), 16);
}
void score7_cpu_device::op_lhu()
{
uint8_t rd = GET_LS_RD(m_op);
uint8_t ra = GET_LS_RA(m_op);
int32_t simm15 = sign_extend(GET_LS_IMM15(m_op), 15);
int32_t simm15 = util::sext(GET_LS_IMM15(m_op), 15);
m_gpr[rd] = read_word(m_gpr[ra] + simm15);
}
@ -1076,16 +1065,16 @@ void score7_cpu_device::op_lb()
{
uint8_t rd = GET_LS_RD(m_op);
uint8_t ra = GET_LS_RA(m_op);
int32_t simm15 = sign_extend(GET_LS_IMM15(m_op), 15);
int32_t simm15 = util::sext(GET_LS_IMM15(m_op), 15);
m_gpr[rd] = sign_extend(read_byte(m_gpr[ra] + simm15), 8);
m_gpr[rd] = util::sext(read_byte(m_gpr[ra] + simm15), 8);
}
void score7_cpu_device::op_sw()
{
uint8_t rd = GET_LS_RD(m_op);
uint8_t ra = GET_LS_RA(m_op);
int32_t simm15 = sign_extend(GET_LS_IMM15(m_op), 15);
int32_t simm15 = util::sext(GET_LS_IMM15(m_op), 15);
write_dword(m_gpr[ra] + simm15, m_gpr[rd]);
}
@ -1094,7 +1083,7 @@ void score7_cpu_device::op_sh()
{
uint8_t rd = GET_LS_RD(m_op);
uint8_t ra = GET_LS_RA(m_op);
int32_t simm15 = sign_extend(GET_LS_IMM15(m_op), 15);
int32_t simm15 = util::sext(GET_LS_IMM15(m_op), 15);
write_word(m_gpr[ra] + simm15, m_gpr[rd] & 0xffff);
}
@ -1103,7 +1092,7 @@ void score7_cpu_device::op_lbu()
{
uint8_t rd = GET_LS_RD(m_op);
uint8_t ra = GET_LS_RA(m_op);
int32_t simm15 = sign_extend(GET_LS_IMM15(m_op), 15);
int32_t simm15 = util::sext(GET_LS_IMM15(m_op), 15);
m_gpr[rd] = read_byte(m_gpr[ra] + simm15);
}
@ -1112,7 +1101,7 @@ void score7_cpu_device::op_sb()
{
uint8_t rd = GET_LS_RD(m_op);
uint8_t ra = GET_LS_RA(m_op);
int32_t simm15 = sign_extend(GET_LS_IMM15(m_op), 15);
int32_t simm15 = util::sext(GET_LS_IMM15(m_op), 15);
write_byte(m_gpr[ra] + simm15, m_gpr[rd] & 0xff);
}
@ -1167,7 +1156,7 @@ void score7_cpu_device::op_rform1()
m_gpr[rd] = m_gpr[rd] >> (m_gpr[ra] & 0x1f);
break;
case 0x0b: // sra!
m_gpr[rd] = sign_extend(m_gpr[rd] >> (m_gpr[ra] & 0x1f), 32 - (m_gpr[ra] & 0x1f));
m_gpr[rd] = util::sext(m_gpr[rd] >> (m_gpr[ra] & 0x1f), 32 - (m_gpr[ra] & 0x1f));
break;
case 0x0c: // brl!
if (check_condition_branch(rd))
@ -1244,7 +1233,7 @@ void score7_cpu_device::op_rform2()
m_gpr[rd] = read_dword(m_gpr[ra]);
break;
case 0x09: // lh!
m_gpr[rd] = sign_extend(read_word(m_gpr[ra]), 16);
m_gpr[rd] = util::sext(read_word(m_gpr[ra]), 16);
break;
case 0x0a: // pop!
m_gpr[GET_P_RDG(m_op)] = read_dword(m_gpr[GET_P_RAG(m_op)]);
@ -1280,7 +1269,7 @@ void score7_cpu_device::op_jform()
void score7_cpu_device::op_branch16()
{
if(check_condition_branch(GET_BX_EC(m_op)))
m_pc = m_ppc + (sign_extend(GET_BX_DISP8(m_op), 8) << 1);
m_pc = m_ppc + (util::sext(GET_BX_DISP8(m_op), 8) << 1);
}
void score7_cpu_device::op_ldiu()
@ -1355,7 +1344,7 @@ void score7_cpu_device::op_iform1b()
m_gpr[rd] = read_dword(REG_BP + (imm5<<2));
break;
case 0x01: // lhp!
m_gpr[rd] = sign_extend(read_word(REG_BP + (imm5<<1)), 16);
m_gpr[rd] = util::sext(read_word(REG_BP + (imm5<<1)), 16);
break;
case 0x03: // lbup!
m_gpr[rd] = read_byte(REG_BP + imm5);

1
src/devices/cpu/score/score.h
View File

@ -60,7 +60,6 @@ private:
// helpers
bool check_condition_branch(uint8_t bc);
bool check_condition(uint8_t bc);
int32_t sign_extend(uint32_t data, uint8_t len);
uint32_t fetch();
uint8_t read_byte(offs_t offset);
uint16_t read_word(offs_t offset);

23
src/devices/cpu/score/scoredsm.cpp
View File

@ -22,13 +22,6 @@ const char *const score7_disassembler::m_i1a_op[8] = { "addei", "slli", "sdbbp"
const char *const score7_disassembler::m_i1b_op[8] = { "lwp", "lhp", "", "lbup", "swp", "shp", "", "sbp" };
const char *const score7_disassembler::m_cr_op[2] = { "mtcr", "mfcr" };
int32_t score7_disassembler::sign_extend(uint32_t data, uint8_t len)
{
data &= (1 << len) - 1;
uint32_t sign = 1 << (len - 1);
return (data ^ sign) - sign;
}
void score7_disassembler::disasm32(std::ostream &stream, offs_t pc, uint32_t opcode)
{
switch((opcode >> 25) & 0x1f)
@ -112,7 +105,7 @@ void score7_disassembler::disasm32(std::ostream &stream, offs_t pc, uint32_t opc
switch(GET_I_FUNC3(opcode))
{
case 0x00:
util::stream_format(stream, "%s%s r%d, %d", m_i1_op[GET_I_FUNC3(opcode)], GET_I_CU(opcode) ? ".c": "", GET_I_RD(opcode), sign_extend(GET_I_IMM16(opcode), 16));
util::stream_format(stream, "%s%s r%d, %d", m_i1_op[GET_I_FUNC3(opcode)], GET_I_CU(opcode) ? ".c": "", GET_I_RD(opcode), util::sext(GET_I_IMM16(opcode), 16));
break;
case 0x02: case 0x04: case 0x05: case 0x06:
util::stream_format(stream, "%s%s r%d, 0x%04x", m_i1_op[GET_I_FUNC3(opcode)], GET_I_CU(opcode) ? ".c": "", GET_I_RD(opcode), GET_I_IMM16(opcode));
@ -125,10 +118,10 @@ void score7_disassembler::disasm32(std::ostream &stream, offs_t pc, uint32_t opc
util::stream_format(stream, "j%s 0x%08x", GET_J_LK(opcode) ? "l": "", (pc & 0xfc000000) | (GET_J_DISP24(opcode) << 1));
break;
case 0x03: // RIX-form-1
util::stream_format(stream, "%s r%d, [r%d, %d]+", m_rix1_op[GET_RIX_FUNC3(opcode)], GET_RIX_RD(opcode), GET_RIX_RA(opcode), sign_extend(GET_RIX_IMM12(opcode), 12));
util::stream_format(stream, "%s r%d, [r%d, %d]+", m_rix1_op[GET_RIX_FUNC3(opcode)], GET_RIX_RD(opcode), GET_RIX_RA(opcode), util::sext(GET_RIX_IMM12(opcode), 12));
break;
case 0x04:
util::stream_format(stream, "b%s%s 0x%08x", m_cond[GET_BC_BC(opcode) & 0x0f], GET_BC_LK(opcode) ? "l": "", pc + (sign_extend(GET_BC_DISP19(opcode), 19) << 1));
util::stream_format(stream, "b%s%s 0x%08x", m_cond[GET_BC_BC(opcode) & 0x0f], GET_BC_LK(opcode) ? "l": "", pc + (util::sext(GET_BC_DISP19(opcode), 19) << 1));
break;
case 0x05: // I-form-2
switch(GET_I_FUNC3(opcode))
@ -158,10 +151,10 @@ void score7_disassembler::disasm32(std::ostream &stream, offs_t pc, uint32_t opc
}
break;
case 0x07: // RIX-form-2
util::stream_format(stream, "%s r%d, [r%d]+, %d", m_rix2_op[GET_RIX_FUNC3(opcode)], GET_RIX_RD(opcode), GET_RIX_RA(opcode), sign_extend(GET_RIX_IMM12(opcode), 12));
util::stream_format(stream, "%s r%d, [r%d]+, %d", m_rix2_op[GET_RIX_FUNC3(opcode)], GET_RIX_RD(opcode), GET_RIX_RA(opcode), util::sext(GET_RIX_IMM12(opcode), 12));
break;
case 0x08:
util::stream_format(stream, "addri%s r%d, r%d, %d", GET_RI_CU(opcode) ? ".c": "", GET_RI_RD(opcode), GET_RI_RA(opcode), sign_extend(GET_RI_IMM14(opcode), 14));
util::stream_format(stream, "addri%s r%d, r%d, %d", GET_RI_CU(opcode) ? ".c": "", GET_RI_RD(opcode), GET_RI_RA(opcode), util::sext(GET_RI_IMM14(opcode), 14));
break;
case 0x0c:
util::stream_format(stream, "andri%s r%d, r%d, 0x%04x", GET_RI_CU(opcode) ? ".c": "", GET_RI_RD(opcode), GET_RI_RA(opcode), GET_RI_IMM14(opcode));
@ -171,10 +164,10 @@ void score7_disassembler::disasm32(std::ostream &stream, offs_t pc, uint32_t opc
break;
case 0x10: case 0x11: case 0x12: case 0x13:
case 0x14: case 0x15: case 0x16: case 0x17:
util::stream_format(stream, "%s r%d, [r%d, %d]", m_ls_op[(opcode >> 25) & 0x07], GET_LS_RD(opcode), GET_LS_RA(opcode), sign_extend(GET_LS_IMM15(opcode), 15));
util::stream_format(stream, "%s r%d, [r%d, %d]", m_ls_op[(opcode >> 25) & 0x07], GET_LS_RD(opcode), GET_LS_RA(opcode), util::sext(GET_LS_IMM15(opcode), 15));
break;
case 0x18:
util::stream_format(stream, "cache 0x%02x, [r%d, %d]", GET_LS_RD(opcode), GET_LS_RA(opcode), sign_extend(GET_LS_IMM15(opcode), 15));
util::stream_format(stream, "cache 0x%02x, [r%d, %d]", GET_LS_RD(opcode), GET_LS_RA(opcode), util::sext(GET_LS_IMM15(opcode), 15));
break;
case 0x1c:
util::stream_format(stream, "<CENew op: 0x%x>", opcode);
@ -228,7 +221,7 @@ void score7_disassembler::disasm16(std::ostream &stream, offs_t pc, uint16_t opc
util::stream_format(stream, "j%s! 0x%08x", GET_J_LK(opcode) ? "l": "", (pc & 0xfffff000) | (GET_J_DISP11(opcode) << 1));
break;
case 0x04:
util::stream_format(stream, "b%s! 0x%08x", m_cond[GET_BX_EC(opcode)], pc + sign_extend(GET_BX_DISP8(opcode) << 1, 9));
util::stream_format(stream, "b%s! 0x%08x", m_cond[GET_BX_EC(opcode)], pc + util::sext(GET_BX_DISP8(opcode) << 1, 9));
break;
case 0x05:
util::stream_format(stream, "ldiu! r%d, 0x%02x", GET_I2_RD(opcode), GET_I2_IMM8(opcode));

1
src/devices/cpu/score/scoredsm.h
View File

@ -34,7 +34,6 @@ private:
static const char *const m_i1b_op[8];
static const char *const m_cr_op[2];
int32_t sign_extend(uint32_t data, uint8_t len);
offs_t disasm(std::ostream &stream, offs_t pc, uint32_t opcode);
void disasm32(std::ostream &stream, offs_t pc, uint32_t opcode);
void disasm16(std::ostream &stream, offs_t pc, uint16_t opcode);