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 OF detection method

Browse source
This commit is contained in:
rkx1209 2018-05-08 02:38:19 +09:00
parent f22016984e
commit 44ed2985ad
4 changed files with 41 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
ARMv8/Interpreter.cpp
View file

@ -10,8 +10,8 @@ void Interpreter::Init() {
int Interpreter::SingleStep() {
uint32_t inst = ARMv8::ReadInst (PC);
// debug_print ("Run Code: 0x%lx: 0x%08lx\n", PC, inst);
ns_print ("Run Code: 0x%lx: 0x%08lx\n", PC, inst);
debug_print ("Run Code: 0x%lx: 0x%08lx\n", PC, inst);
//ns_print ("Run Code: 0x%lx: 0x%08lx\n", PC, inst);
Disassembler::DisasA64 (inst, disas_cb);
PC += sizeof(uint32_t);
X(GPR_ZERO) = 0; //Reset Zero register
@ -21,7 +21,7 @@ int Interpreter::SingleStep() {
void Interpreter::Run() {
debug_print ("Running with Interpreter\n");
static uint64_t counter = 0;
uint64_t estimate = 3456400, mx = 100000;
uint64_t estimate = 3417800, mx = 1000000;
//uint64_t estimate = 0, mx = 3420000;
while (Cpu::GetState () == Cpu::State::Running) {
if (GdbStub::enabled) {
@ -37,9 +37,9 @@ void Interpreter::Run() {
}
} else {
if (counter >= estimate){
//Cpu::DumpMachine ();
Cpu::DumpMachine ();
}
Cpu::DumpMachine ();
//Cpu::DumpMachine ();
if (counter >= estimate + mx) {
break;
}
@ -94,15 +94,25 @@ static bool CondHold(unsigned int cond) {
return result;
}
static inline bool IsNegative32(uint32_t num) {
return (num & (1UL << 31)) != 0;
}
static inline bool IsNegative64(uint64_t num) {
return (num & (1UL << 63)) != 0;
}
static void UpdateFlag32(uint32_t res, uint32_t arg1, uint32_t arg2) {
/* XXX: In ARMv8, nzcv flag is only updated when ADD/SUB/AND/BIC.
* So following logic can work correctly(?)
*/
uint32_t nzcv = 0;
if (res & (1UL << 31)) nzcv |= N_MASK; // N
if (IsNegative32(res)) nzcv |= N_MASK; // N
if (res == 0UL) nzcv |= Z_MASK; // Z
if (((arg1 & arg2) + ((arg1 ^ arg2) >> 1)) >> 31) nzcv |= C_MASK; //C (half adder ((x & y) + ((x ^ y) >> 1)))
if (!(arg1 ^ arg2 && (1UL < 31)) & (arg2 ^ res && (1UL < 31))) nzcv |= V_MASK; //V
if ((IsNegative32(arg1) && IsNegative32(arg2) && !IsNegative32(res)) ||
(!IsNegative32(arg1) && !IsNegative32(arg2) && IsNegative32(res))) {
nzcv |= V_MASK; //V
}
NZCV = nzcv;
}
static void UpdateFlag64(uint64_t res, uint64_t arg1, uint64_t arg2) {
@ -110,10 +120,13 @@ static void UpdateFlag64(uint64_t res, uint64_t arg1, uint64_t arg2) {
* So following logic can work correctly(?)
*/
uint32_t nzcv = 0;
if (res & (1ULL << 63)) nzcv |= N_MASK; // N
if (IsNegative64(res)) nzcv |= N_MASK; // N
if (res == 0ULL) nzcv |= Z_MASK; // Z
if (((arg1 & arg2) + ((arg1 ^ arg2) >> 1)) >> 63) nzcv |= C_MASK; //C (half adder ((x & y) + ((x ^ y) >> 1)))
if (!(arg1 ^ arg2 && (1ULL < 63)) & (arg2 ^ res && (1ULL < 63))) nzcv |= V_MASK; //V
if ((IsNegative64(arg1) && IsNegative64(arg2) && !IsNegative64(res)) ||
(!IsNegative64(arg1) && !IsNegative64(arg2) && IsNegative64(res))) {
nzcv |= V_MASK; //V
}
NZCV = nzcv;
}
@ -228,7 +241,11 @@ static void ArithmeticLogic(unsigned int rd_idx, uint64_t arg1, uint64_t arg2, b
uint64_t result;
OpType op = _op;
if (_op == AL_TYPE_SUB) {
arg2 = -(int64_t) arg2;
if (bit64) {
arg2 = -(int64_t) arg2;
} else {
arg2 = -(int32_t) arg2;
}
op = AL_TYPE_ADD;
}
result = ALCalc (arg1, arg2, op);

2
GdbStub.cpp
View file

@ -251,7 +251,7 @@ void NotifyMemAccess(unsigned long addr, size_t len, bool read) {
int type = read ? GDB_WATCHPOINT_READ : GDB_WATCHPOINT_WRITE;
for (int i = 0; i < wp_list.size(); i++) {
Watchpoint wp = wp_list[i];
if (wp.addr <= addr && addr + len <= wp.addr + wp.len) {
if (addr <= wp.addr && wp.addr + wp.len <= addr + len) {
if (wp.type == GDB_WATCHPOINT_ACCESS || wp.type == type) {
ns_print("Hit watchpoint 0x%lx, %d, %s (PC:0x%lx)\n", addr, len, (read ? "read" : "write"), PC);
HitWatchpoint (addr, wp.type);

12
Memory.cpp
View file

@ -27,19 +27,17 @@ RAMBlock::RAMBlock(std::string _name, uint64_t _addr, size_t _length, uint8_t *r
namespace Memory
{
uint64_t heap_base = 0x9000000;
uint64_t heap_size = 0x1000000;
//uint64_t heap_size = 0x0;
uint64_t heap_size = 0x0;
uint8_t *pRAM; // XXX: Replace raw pointer to View wrapper.
size_t ram_size = 0x10000000;
uint64_t straight_max = heap_base + heap_size;
std::vector<RAMBlock*> regions;
static RAMBlock mem_map_straight[] =
{
RAMBlock (".text", 0x0, 0x1000000, PROT_READ | PROT_WRITE | PROT_EXEC),
RAMBlock (".rdata", 0x1000000, 0x1000000, PROT_READ | PROT_WRITE),
RAMBlock (".data", 0x2000000, 0x1000000, PROT_READ | PROT_WRITE),
RAMBlock ("[stack]", 0x3000000, 0x6000000, PROT_READ | PROT_WRITE),
RAMBlock ("[heap]", heap_base, heap_size, PROT_READ | PROT_WRITE),
RAMBlock (".text", 0x0, 0x0ffffff, PROT_READ | PROT_WRITE | PROT_EXEC),
RAMBlock (".rdata", 0x1000000, 0x0ffffff, PROT_READ | PROT_WRITE),
RAMBlock (".data", 0x2000000, 0x0ffffff, PROT_READ | PROT_WRITE),
RAMBlock ("[stack]", 0x3000000, 0x5ffffff, PROT_READ | PROT_WRITE),
};
static bool inline IsStraight(uint64_t addr, size_t len) {

9
Svc.cpp
View file

@ -105,7 +105,14 @@ void Init() {
}
std::tuple<uint64_t, uint64_t> SetHeapSize(uint64_t size) {
ns_print("SetHeapSize 0x%lx\n", size);
return make_tuple(0, -1);
if (Memory::heap_size < size) {
Memory::AddMemmap (Memory::heap_base, size - Memory::heap_size);
} else if (Memory::heap_size > size) {
/* TODO: */
}
Memory::heap_size = size;
return make_tuple(0, Memory::heap_base);
}
uint64_t SetMemoryAttribute(uint64_t addr, uint64_t size, uint64_t state0, uint64_t state1) {