added very hackish ARMulator core initialization and CPU stepping
This commit is contained in:
parent
c7f4914a90
commit
d4b529111a
|
@ -24,9 +24,24 @@
|
|||
|
||||
#include "log.h"
|
||||
#include "core.h"
|
||||
#include "mem_map.h"
|
||||
#include "arm/armdefs.h"
|
||||
#include "arm/disassembler/arm_disasm.h"
|
||||
|
||||
namespace Core {
|
||||
|
||||
typedef struct arm11_core{
|
||||
conf_object_t* obj;
|
||||
ARMul_State* state;
|
||||
memory_space_intf* space;
|
||||
}arm11_core_t;
|
||||
|
||||
arm11_core* core = NULL;
|
||||
|
||||
Arm* disasm = NULL;
|
||||
|
||||
//ARMul_State* g_arm_state = NULL;
|
||||
|
||||
/// Start the core
|
||||
void Start() {
|
||||
// TODO(ShizZy): ImplementMe
|
||||
|
@ -39,6 +54,41 @@ void RunLoop() {
|
|||
|
||||
/// Step the CPU one instruction
|
||||
void SingleStep() {
|
||||
//arm11_core_t* core = (arm11_core_t*)opaque->obj;
|
||||
ARMul_State *state = core->state;
|
||||
//if (state->space.conf_obj == NULL){
|
||||
// state->space.conf_obj = core->space->conf_obj;
|
||||
// state->space.read = core->space->read;
|
||||
// state->space.write = core->space->write;
|
||||
//}
|
||||
|
||||
char next_instr[255];
|
||||
|
||||
disasm->disasm(state->pc, Memory::Read32(state->pc), next_instr);
|
||||
|
||||
NOTICE_LOG(ARM11, "0x%08X : %s", state->pc, next_instr);
|
||||
|
||||
|
||||
for (int i = 0; i < 15; i++) {
|
||||
NOTICE_LOG(ARM11, "Reg[%02d] = 0x%08X", i, state->Reg[i]);
|
||||
}
|
||||
|
||||
|
||||
state->step++;
|
||||
state->cycle++;
|
||||
state->EndCondition = 0;
|
||||
state->stop_simulator = 0;
|
||||
//state->NextInstr = RESUME; /* treat as PC change */
|
||||
state->last_pc = state->Reg[15];
|
||||
state->Reg[15] = ARMul_DoInstr(state);
|
||||
state->Cpsr = (state->Cpsr & 0x0fffffdf) | \
|
||||
(state->NFlag << 31) | \
|
||||
(state->ZFlag << 30) | \
|
||||
(state->CFlag << 29) | \
|
||||
(state->VFlag << 28);// | \
|
||||
//(state->TFlag << 5);
|
||||
|
||||
//FLUSHPIPE;
|
||||
}
|
||||
|
||||
/// Halt the core
|
||||
|
@ -52,9 +102,50 @@ void Stop() {
|
|||
}
|
||||
|
||||
/// Initialize the core
|
||||
const static cpu_config_t arm11_cpu_info = { "armv6", "arm11", 0x0007b000, 0x0007f000, NONCACHE };
|
||||
int Init() {
|
||||
NOTICE_LOG(MASTER_LOG, "Core initialized OK");
|
||||
|
||||
disasm = new Arm();
|
||||
core = (arm11_core_t*)malloc(sizeof(arm11_core_t));
|
||||
//core->obj = new_conf_object(obj_name, core);
|
||||
ARMul_EmulateInit();
|
||||
ARMul_State* state = new ARMul_State;
|
||||
ARMul_NewState(state);
|
||||
state->abort_model = 0;
|
||||
state->cpu = (cpu_config_t*)&arm11_cpu_info;
|
||||
state->bigendSig = LOW;
|
||||
|
||||
ARMul_SelectProcessor(state, ARM_v6_Prop | ARM_v5_Prop | ARM_v5e_Prop);
|
||||
state->lateabtSig = LOW;
|
||||
mmu_init(state);
|
||||
/* reset the core to initial state */
|
||||
ARMul_Reset(state);
|
||||
state->NextInstr = 0;
|
||||
state->Emulate = 3;
|
||||
#if 0
|
||||
state->mmu.ops.read_byte = arm11_read_byte;
|
||||
state->mmu.ops.read_halfword = arm11_read_halfword;
|
||||
state->mmu.ops.read_word = arm11_read_word;
|
||||
state->mmu.ops.write_byte = arm11_write_byte;
|
||||
state->mmu.ops.write_halfword = arm11_write_halfword;
|
||||
state->mmu.ops.write_word = arm11_write_word;
|
||||
#endif
|
||||
core->state = state;
|
||||
|
||||
state->pc = state->Reg[15] = 0x080c3ee0; // Hardcoded set PC to start address of a homebrew ROM
|
||||
// this is where most launcher.dat code loads /bunnei
|
||||
|
||||
state->Reg[13] = 0x10000000; // Set stack pointer to the top of the stack, not sure if this is
|
||||
// right? /bunnei
|
||||
|
||||
//state->s
|
||||
return 0;
|
||||
}
|
||||
|
||||
void Shutdown() {
|
||||
//delete g_arm_state;
|
||||
//g_arm_state = NULL;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
|
Reference in New Issue