Emulation/nsemu
1
0
Fork 0
mirror of https://github.com/RKX1209/nsemu.git synced 2024-06-23 06:32:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some bugs

Browse source
This commit is contained in:
rkx1209 2018-06-05 18:44:35 +09:00
parent 3564c422b2
commit 143231f035
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ARMv8/ARMv8.cpp
View file

@ -47,7 +47,7 @@ static uint64_t counter;
void DumpJson(FILE *fp) {
file_print (fp, "%lu : {\n", counter++);
int r;
for (r = 0; r < GPR_DUMMY; r++) {
for (r = 0; r <= PC_IDX; r++) {
file_print (fp, "\"X%d\" : \"0x%016lx\",\n", r, X(r));
}
file_print (fp, "\"X%d\" : \"0x%016x\"\n", r, NZCV);

3
ARMv8/Disassembler.cpp
View file

@ -1081,7 +1081,8 @@ static void DisasLdstRegRoffset(uint32_t insn, DisasCallback *cb,
//is_extended = (size < 3) && extract32(opc, 0, 1);
is_extended = (size < 3); //TODO: treat other case, size = 0, 1(8bit-> or 16bit->)
}
bool sf = DisasLdstCompute64bit (size, is_signed, opc);
//bool sf = DisasLdstCompute64bit (size, is_signed, opc);
bool sf = (opt & 0x1) ? true : false; // XXX: Correct?
cb->ExtendReg (GPR_DUMMY, rm, opt, sf);
cb->ShiftI64 (GPR_DUMMY, GPR_DUMMY, ShiftType_LSL, shift ? size : 0, sf);
if (is_store) {

17
ARMv8/Interpreter.cpp
View file

@ -21,8 +21,7 @@ int Interpreter::SingleStep() {
void Interpreter::Run() {
debug_print ("Running with Interpreter\n");
static uint64_t counter = 0;
//uint64_t estimate = 3500000, mx = 100000;
uint64_t estimate = 3490000, mx = 100000;
uint64_t estimate = 3500000, mx = 3720;
//uint64_t estimate = 0, mx = 100000;
while (Cpu::GetState () == Cpu::State::Running) {
if (GdbStub::enabled) {
@ -209,7 +208,7 @@ static void Smul64(uint64_t *res_h, uint64_t *res_l, uint64_t arg1, uint64_t arg
*res_h = rh;
}
static uint64_t ALCalc(uint64_t arg1, uint64_t arg2, OpType op) {
static uint64_t ALCalc(uint64_t arg1, uint64_t arg2, bool bit64, OpType op) {
if (op == AL_TYPE_ADD)
return arg1 + arg2;
if (op == AL_TYPE_AND)
@ -222,8 +221,12 @@ static uint64_t ALCalc(uint64_t arg1, uint64_t arg2, OpType op) {
return arg1 << arg2;
if (op == AL_TYPE_LSR)
return arg1 >> arg2;
if (op == AL_TYPE_ASR)
return (int64_t) arg1 >> arg2;
if (op == AL_TYPE_ASR) {
if (bit64)
return ((int64_t) arg1) >> arg2;
else
return ((int32_t) arg1) >> arg2;
}
if (op == AL_TYPE_ROR)
return RotateRight (arg1, arg2);
if (op == AL_TYPE_UDIV) {
@ -248,7 +251,7 @@ static uint64_t _ArithmeticLogic(uint64_t arg1, uint64_t arg2, bool setflags, bo
}
op = AL_TYPE_ADD;
}
result = ALCalc (arg1, arg2, op);
result = ALCalc (arg1, arg2, bit64, op);
if (setflags) {
if (bit64) {
UpdateFlag64 (result, arg1, arg2);
@ -509,7 +512,7 @@ void IntprCallback::EorReg(unsigned int rd_idx, unsigned int rn_idx, unsigned in
}
void IntprCallback::BicReg(unsigned int rd_idx, unsigned int rn_idx, unsigned int rm_idx, bool setflags, bool bit64) {
char regc = bit64? 'X': 'W';
debug_print ("BIC: %c[%u] = %c[%u] & ~%c[%u]\n", regc, rd_idx, regc, rn_idx, regc, rm_idx);
debug_print ("BIC: %c[%u] = %c[%u](0x%lx) & ~%c[%u](~0x%lx)\n", regc, rd_idx, regc, rn_idx, X(rn_idx), regc, rm_idx, X(rm_idx));
if (bit64)
ArithmeticLogic (rd_idx, X(rn_idx), ~X(rm_idx), false, bit64, AL_TYPE_AND);
else