summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/core/arm/dyncom/arm_dyncom_interpreter.cpp1
-rw-r--r--src/core/arm/interpreter/arminit.cpp74
-rw-r--r--src/core/arm/interpreter/armsupp.cpp214
-rw-r--r--src/core/arm/skyeye_common/arm_regformat.h40
-rw-r--r--src/core/arm/skyeye_common/armdefs.h2
5 files changed, 163 insertions, 168 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
index b0efd7194..b8fbe7f3a 100644
--- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
@@ -3700,7 +3700,6 @@ unsigned InterpreterMainLoop(ARMul_State* state) {
#define OPCODE_1 inst_cream->opcode_1
#define OPCODE_2 inst_cream->opcode_2
#define CRm inst_cream->crm
- #define CP15_REG(n) cpu->CP15[CP15(n)]
#define RD cpu->Reg[inst_cream->Rd]
#define RD2 cpu->Reg[inst_cream->Rd + 1]
#define RN cpu->Reg[inst_cream->Rn]
diff --git a/src/core/arm/interpreter/arminit.cpp b/src/core/arm/interpreter/arminit.cpp
index c6b8197f6..7254a16f3 100644
--- a/src/core/arm/interpreter/arminit.cpp
+++ b/src/core/arm/interpreter/arminit.cpp
@@ -71,58 +71,58 @@ void ARMul_SelectProcessor(ARMul_State* state, unsigned properties)
static void ResetMPCoreCP15Registers(ARMul_State* cpu)
{
// c0
- cpu->CP15[CP15(CP15_MAIN_ID)] = 0x410FB024;
- cpu->CP15[CP15(CP15_TLB_TYPE)] = 0x00000800;
- cpu->CP15[CP15(CP15_PROCESSOR_FEATURE_0)] = 0x00000111;
- cpu->CP15[CP15(CP15_PROCESSOR_FEATURE_1)] = 0x00000001;
- cpu->CP15[CP15(CP15_DEBUG_FEATURE_0)] = 0x00000002;
- cpu->CP15[CP15(CP15_MEMORY_MODEL_FEATURE_0)] = 0x01100103;
- cpu->CP15[CP15(CP15_MEMORY_MODEL_FEATURE_1)] = 0x10020302;
- cpu->CP15[CP15(CP15_MEMORY_MODEL_FEATURE_2)] = 0x01222000;
- cpu->CP15[CP15(CP15_MEMORY_MODEL_FEATURE_3)] = 0x00000000;
- cpu->CP15[CP15(CP15_ISA_FEATURE_0)] = 0x00100011;
- cpu->CP15[CP15(CP15_ISA_FEATURE_1)] = 0x12002111;
- cpu->CP15[CP15(CP15_ISA_FEATURE_2)] = 0x11221011;
- cpu->CP15[CP15(CP15_ISA_FEATURE_3)] = 0x01102131;
- cpu->CP15[CP15(CP15_ISA_FEATURE_4)] = 0x00000141;
+ cpu->CP15[CP15_MAIN_ID] = 0x410FB024;
+ cpu->CP15[CP15_TLB_TYPE] = 0x00000800;
+ cpu->CP15[CP15_PROCESSOR_FEATURE_0] = 0x00000111;
+ cpu->CP15[CP15_PROCESSOR_FEATURE_1] = 0x00000001;
+ cpu->CP15[CP15_DEBUG_FEATURE_0] = 0x00000002;
+ cpu->CP15[CP15_MEMORY_MODEL_FEATURE_0] = 0x01100103;
+ cpu->CP15[CP15_MEMORY_MODEL_FEATURE_1] = 0x10020302;
+ cpu->CP15[CP15_MEMORY_MODEL_FEATURE_2] = 0x01222000;
+ cpu->CP15[CP15_MEMORY_MODEL_FEATURE_3] = 0x00000000;
+ cpu->CP15[CP15_ISA_FEATURE_0] = 0x00100011;
+ cpu->CP15[CP15_ISA_FEATURE_1] = 0x12002111;
+ cpu->CP15[CP15_ISA_FEATURE_2] = 0x11221011;
+ cpu->CP15[CP15_ISA_FEATURE_3] = 0x01102131;
+ cpu->CP15[CP15_ISA_FEATURE_4] = 0x00000141;
// c1
- cpu->CP15[CP15(CP15_CONTROL)] = 0x00054078;
- cpu->CP15[CP15(CP15_AUXILIARY_CONTROL)] = 0x0000000F;
- cpu->CP15[CP15(CP15_COPROCESSOR_ACCESS_CONTROL)] = 0x00000000;
+ cpu->CP15[CP15_CONTROL] = 0x00054078;
+ cpu->CP15[CP15_AUXILIARY_CONTROL] = 0x0000000F;
+ cpu->CP15[CP15_COPROCESSOR_ACCESS_CONTROL] = 0x00000000;
// c2
- cpu->CP15[CP15(CP15_TRANSLATION_BASE_TABLE_0)] = 0x00000000;
- cpu->CP15[CP15(CP15_TRANSLATION_BASE_TABLE_1)] = 0x00000000;
- cpu->CP15[CP15(CP15_TRANSLATION_BASE_CONTROL)] = 0x00000000;
+ cpu->CP15[CP15_TRANSLATION_BASE_TABLE_0] = 0x00000000;
+ cpu->CP15[CP15_TRANSLATION_BASE_TABLE_1] = 0x00000000;
+ cpu->CP15[CP15_TRANSLATION_BASE_CONTROL] = 0x00000000;
// c3
- cpu->CP15[CP15(CP15_DOMAIN_ACCESS_CONTROL)] = 0x00000000;
+ cpu->CP15[CP15_DOMAIN_ACCESS_CONTROL] = 0x00000000;
// c7
- cpu->CP15[CP15(CP15_PHYS_ADDRESS)] = 0x00000000;
+ cpu->CP15[CP15_PHYS_ADDRESS] = 0x00000000;
// c9
- cpu->CP15[CP15(CP15_DATA_CACHE_LOCKDOWN)] = 0xFFFFFFF0;
+ cpu->CP15[CP15_DATA_CACHE_LOCKDOWN] = 0xFFFFFFF0;
// c10
- cpu->CP15[CP15(CP15_TLB_LOCKDOWN)] = 0x00000000;
- cpu->CP15[CP15(CP15_PRIMARY_REGION_REMAP)] = 0x00098AA4;
- cpu->CP15[CP15(CP15_NORMAL_REGION_REMAP)] = 0x44E048E0;
+ cpu->CP15[CP15_TLB_LOCKDOWN] = 0x00000000;
+ cpu->CP15[CP15_PRIMARY_REGION_REMAP] = 0x00098AA4;
+ cpu->CP15[CP15_NORMAL_REGION_REMAP] = 0x44E048E0;
// c13
- cpu->CP15[CP15(CP15_PID)] = 0x00000000;
- cpu->CP15[CP15(CP15_CONTEXT_ID)] = 0x00000000;
- cpu->CP15[CP15(CP15_THREAD_UPRW)] = 0x00000000;
- cpu->CP15[CP15(CP15_THREAD_URO)] = 0x00000000;
- cpu->CP15[CP15(CP15_THREAD_PRW)] = 0x00000000;
+ cpu->CP15[CP15_PID] = 0x00000000;
+ cpu->CP15[CP15_CONTEXT_ID] = 0x00000000;
+ cpu->CP15[CP15_THREAD_UPRW] = 0x00000000;
+ cpu->CP15[CP15_THREAD_URO] = 0x00000000;
+ cpu->CP15[CP15_THREAD_PRW] = 0x00000000;
// c15
- cpu->CP15[CP15(CP15_PERFORMANCE_MONITOR_CONTROL)] = 0x00000000;
- cpu->CP15[CP15(CP15_MAIN_TLB_LOCKDOWN_VIRT_ADDRESS)] = 0x00000000;
- cpu->CP15[CP15(CP15_MAIN_TLB_LOCKDOWN_PHYS_ADDRESS)] = 0x00000000;
- cpu->CP15[CP15(CP15_MAIN_TLB_LOCKDOWN_ATTRIBUTE)] = 0x00000000;
- cpu->CP15[CP15(CP15_TLB_DEBUG_CONTROL)] = 0x00000000;
+ cpu->CP15[CP15_PERFORMANCE_MONITOR_CONTROL] = 0x00000000;
+ cpu->CP15[CP15_MAIN_TLB_LOCKDOWN_VIRT_ADDRESS] = 0x00000000;
+ cpu->CP15[CP15_MAIN_TLB_LOCKDOWN_PHYS_ADDRESS] = 0x00000000;
+ cpu->CP15[CP15_MAIN_TLB_LOCKDOWN_ATTRIBUTE] = 0x00000000;
+ cpu->CP15[CP15_TLB_DEBUG_CONTROL] = 0x00000000;
}
/***************************************************************************\
@@ -147,7 +147,7 @@ void ARMul_Reset(ARMul_State* state)
//
// TODO: Whenever TLS is implemented, this should contain
// the address of the 0x200-byte TLS
- state->CP15[CP15(CP15_THREAD_URO)] = Memory::KERNEL_MEMORY_VADDR;
+ state->CP15[CP15_THREAD_URO] = Memory::KERNEL_MEMORY_VADDR;
state->EndCondition = 0;
state->ErrorCode = 0;
diff --git a/src/core/arm/interpreter/armsupp.cpp b/src/core/arm/interpreter/armsupp.cpp
index f28fd8c9d..a68d53695 100644
--- a/src/core/arm/interpreter/armsupp.cpp
+++ b/src/core/arm/interpreter/armsupp.cpp
@@ -225,10 +225,10 @@ u32 ReadCP15Register(ARMul_State* cpu, u32 crn, u32 opcode_1, u32 crm, u32 opcod
if (crn == 13 && opcode_1 == 0 && crm == 0)
{
if (opcode_2 == 2)
- return cpu->CP15[CP15(CP15_THREAD_UPRW)];
+ return cpu->CP15[CP15_THREAD_UPRW];
if (opcode_2 == 3)
- return cpu->CP15[CP15(CP15_THREAD_URO)];
+ return cpu->CP15[CP15_THREAD_URO];
}
if (InAPrivilegedMode(cpu))
@@ -238,135 +238,135 @@ u32 ReadCP15Register(ARMul_State* cpu, u32 crn, u32 opcode_1, u32 crm, u32 opcod
if (crm == 0)
{
if (opcode_2 == 0)
- return cpu->CP15[CP15(CP15_MAIN_ID)];
+ return cpu->CP15[CP15_MAIN_ID];
if (opcode_2 == 1)
- return cpu->CP15[CP15(CP15_CACHE_TYPE)];
+ return cpu->CP15[CP15_CACHE_TYPE];
if (opcode_2 == 3)
- return cpu->CP15[CP15(CP15_TLB_TYPE)];
+ return cpu->CP15[CP15_TLB_TYPE];
if (opcode_2 == 5)
- return cpu->CP15[CP15(CP15_CPU_ID)];
+ return cpu->CP15[CP15_CPU_ID];
}
else if (crm == 1)
{
if (opcode_2 == 0)
- return cpu->CP15[CP15(CP15_PROCESSOR_FEATURE_0)];
+ return cpu->CP15[CP15_PROCESSOR_FEATURE_0];
if (opcode_2 == 1)
- return cpu->CP15[CP15(CP15_PROCESSOR_FEATURE_1)];
+ return cpu->CP15[CP15_PROCESSOR_FEATURE_1];
if (opcode_2 == 2)
- return cpu->CP15[CP15(CP15_DEBUG_FEATURE_0)];
+ return cpu->CP15[CP15_DEBUG_FEATURE_0];
if (opcode_2 == 4)
- return cpu->CP15[CP15(CP15_MEMORY_MODEL_FEATURE_0)];
+ return cpu->CP15[CP15_MEMORY_MODEL_FEATURE_0];
if (opcode_2 == 5)
- return cpu->CP15[CP15(CP15_MEMORY_MODEL_FEATURE_1)];
+ return cpu->CP15[CP15_MEMORY_MODEL_FEATURE_1];
if (opcode_2 == 6)
- return cpu->CP15[CP15(CP15_MEMORY_MODEL_FEATURE_2)];
+ return cpu->CP15[CP15_MEMORY_MODEL_FEATURE_2];
if (opcode_2 == 7)
- return cpu->CP15[CP15(CP15_MEMORY_MODEL_FEATURE_3)];
+ return cpu->CP15[CP15_MEMORY_MODEL_FEATURE_3];
}
else if (crm == 2)
{
if (opcode_2 == 0)
- return cpu->CP15[CP15(CP15_ISA_FEATURE_0)];
+ return cpu->CP15[CP15_ISA_FEATURE_0];
if (opcode_2 == 1)
- return cpu->CP15[CP15(CP15_ISA_FEATURE_1)];
+ return cpu->CP15[CP15_ISA_FEATURE_1];
if (opcode_2 == 2)
- return cpu->CP15[CP15(CP15_ISA_FEATURE_2)];
+ return cpu->CP15[CP15_ISA_FEATURE_2];
if (opcode_2 == 3)
- return cpu->CP15[CP15(CP15_ISA_FEATURE_3)];
+ return cpu->CP15[CP15_ISA_FEATURE_3];
if (opcode_2 == 4)
- return cpu->CP15[CP15(CP15_ISA_FEATURE_4)];
+ return cpu->CP15[CP15_ISA_FEATURE_4];
}
}
if (crn == 1 && opcode_1 == 0 && crm == 0)
{
if (opcode_2 == 0)
- return cpu->CP15[CP15(CP15_CONTROL)];
+ return cpu->CP15[CP15_CONTROL];
if (opcode_2 == 1)
- return cpu->CP15[CP15(CP15_AUXILIARY_CONTROL)];
+ return cpu->CP15[CP15_AUXILIARY_CONTROL];
if (opcode_2 == 2)
- return cpu->CP15[CP15(CP15_COPROCESSOR_ACCESS_CONTROL)];
+ return cpu->CP15[CP15_COPROCESSOR_ACCESS_CONTROL];
}
if (crn == 2 && opcode_1 == 0 && crm == 0)
{
if (opcode_2 == 0)
- return cpu->CP15[CP15(CP15_TRANSLATION_BASE_TABLE_0)];
+ return cpu->CP15[CP15_TRANSLATION_BASE_TABLE_0];
if (opcode_2 == 1)
- return cpu->CP15[CP15(CP15_TRANSLATION_BASE_TABLE_1)];
+ return cpu->CP15[CP15_TRANSLATION_BASE_TABLE_1];
if (opcode_2 == 2)
- return cpu->CP15[CP15(CP15_TRANSLATION_BASE_CONTROL)];
+ return cpu->CP15[CP15_TRANSLATION_BASE_CONTROL];
}
if (crn == 3 && opcode_1 == 0 && crm == 0 && opcode_2 == 0)
- return cpu->CP15[CP15(CP15_DOMAIN_ACCESS_CONTROL)];
+ return cpu->CP15[CP15_DOMAIN_ACCESS_CONTROL];
if (crn == 5 && opcode_1 == 0 && crm == 0)
{
if (opcode_2 == 0)
- return cpu->CP15[CP15(CP15_FAULT_STATUS)];
+ return cpu->CP15[CP15_FAULT_STATUS];
if (opcode_2 == 1)
- return cpu->CP15[CP15(CP15_INSTR_FAULT_STATUS)];
+ return cpu->CP15[CP15_INSTR_FAULT_STATUS];
}
if (crn == 6 && opcode_1 == 0 && crm == 0)
{
if (opcode_2 == 0)
- return cpu->CP15[CP15(CP15_FAULT_ADDRESS)];
+ return cpu->CP15[CP15_FAULT_ADDRESS];
if (opcode_2 == 1)
- return cpu->CP15[CP15(CP15_WFAR)];
+ return cpu->CP15[CP15_WFAR];
}
if (crn == 7 && opcode_1 == 0 && crm == 4 && opcode_2 == 0)
- return cpu->CP15[CP15(CP15_PHYS_ADDRESS)];
+ return cpu->CP15[CP15_PHYS_ADDRESS];
if (crn == 9 && opcode_1 == 0 && crm == 0 && opcode_2 == 0)
- return cpu->CP15[CP15(CP15_DATA_CACHE_LOCKDOWN)];
+ return cpu->CP15[CP15_DATA_CACHE_LOCKDOWN];
if (crn == 10 && opcode_1 == 0)
{
if (crm == 0 && opcode_2 == 0)
- return cpu->CP15[CP15(CP15_TLB_LOCKDOWN)];
+ return cpu->CP15[CP15_TLB_LOCKDOWN];
if (crm == 2)
{
if (opcode_2 == 0)
- return cpu->CP15[CP15(CP15_PRIMARY_REGION_REMAP)];
+ return cpu->CP15[CP15_PRIMARY_REGION_REMAP];
if (opcode_2 == 1)
- return cpu->CP15[CP15(CP15_NORMAL_REGION_REMAP)];
+ return cpu->CP15[CP15_NORMAL_REGION_REMAP];
}
}
if (crn == 13 && crm == 0)
{
if (opcode_2 == 0)
- return cpu->CP15[CP15(CP15_PID)];
+ return cpu->CP15[CP15_PID];
if (opcode_2 == 1)
- return cpu->CP15[CP15(CP15_CONTEXT_ID)];
+ return cpu->CP15[CP15_CONTEXT_ID];
if (opcode_2 == 4)
- return cpu->CP15[CP15(CP15_THREAD_PRW)];
+ return cpu->CP15[CP15_THREAD_PRW];
}
if (crn == 15)
@@ -374,32 +374,32 @@ u32 ReadCP15Register(ARMul_State* cpu, u32 crn, u32 opcode_1, u32 crm, u32 opcod
if (opcode_1 == 0 && crm == 12)
{
if (opcode_2 == 0)
- return cpu->CP15[CP15(CP15_PERFORMANCE_MONITOR_CONTROL)];
+ return cpu->CP15[CP15_PERFORMANCE_MONITOR_CONTROL];
if (opcode_2 == 1)
- return cpu->CP15[CP15(CP15_CYCLE_COUNTER)];
+ return cpu->CP15[CP15_CYCLE_COUNTER];
if (opcode_2 == 2)
- return cpu->CP15[CP15(CP15_COUNT_0)];
+ return cpu->CP15[CP15_COUNT_0];
if (opcode_2 == 3)
- return cpu->CP15[CP15(CP15_COUNT_1)];
+ return cpu->CP15[CP15_COUNT_1];
}
if (opcode_1 == 5 && opcode_2 == 2)
{
if (crm == 5)
- return cpu->CP15[CP15(CP15_MAIN_TLB_LOCKDOWN_VIRT_ADDRESS)];
+ return cpu->CP15[CP15_MAIN_TLB_LOCKDOWN_VIRT_ADDRESS];
if (crm == 6)
- return cpu->CP15[CP15(CP15_MAIN_TLB_LOCKDOWN_PHYS_ADDRESS)];
+ return cpu->CP15[CP15_MAIN_TLB_LOCKDOWN_PHYS_ADDRESS];
if (crm == 7)
- return cpu->CP15[CP15(CP15_MAIN_TLB_LOCKDOWN_ATTRIBUTE)];
+ return cpu->CP15[CP15_MAIN_TLB_LOCKDOWN_ATTRIBUTE];
}
if (opcode_1 == 7 && crm == 1 && opcode_2 == 0)
- return cpu->CP15[CP15(CP15_TLB_DEBUG_CONTROL)];
+ return cpu->CP15[CP15_TLB_DEBUG_CONTROL];
}
}
@@ -417,38 +417,38 @@ void WriteCP15Register(ARMul_State* cpu, u32 value, u32 crn, u32 opcode_1, u32 c
if (crn == 1 && opcode_1 == 0 && crm == 0)
{
if (opcode_2 == 0)
- cpu->CP15[CP15(CP15_CONTROL)] = value;
+ cpu->CP15[CP15_CONTROL] = value;
else if (opcode_2 == 1)
- cpu->CP15[CP15(CP15_AUXILIARY_CONTROL)] = value;
+ cpu->CP15[CP15_AUXILIARY_CONTROL] = value;
else if (opcode_2 == 2)
- cpu->CP15[CP15(CP15_COPROCESSOR_ACCESS_CONTROL)] = value;
+ cpu->CP15[CP15_COPROCESSOR_ACCESS_CONTROL] = value;
}
else if (crn == 2 && opcode_1 == 0 && crm == 0)
{
if (opcode_2 == 0)
- cpu->CP15[CP15(CP15_TRANSLATION_BASE_TABLE_0)] = value;
+ cpu->CP15[CP15_TRANSLATION_BASE_TABLE_0] = value;
else if (opcode_2 == 1)
- cpu->CP15[CP15(CP15_TRANSLATION_BASE_TABLE_1)] = value;
+ cpu->CP15[CP15_TRANSLATION_BASE_TABLE_1] = value;
else if (opcode_2 == 2)
- cpu->CP15[CP15(CP15_TRANSLATION_BASE_CONTROL)] = value;
+ cpu->CP15[CP15_TRANSLATION_BASE_CONTROL] = value;
}
else if (crn == 3 && opcode_1 == 0 && crm == 0 && opcode_2 == 0)
{
- cpu->CP15[CP15(CP15_DOMAIN_ACCESS_CONTROL)] = value;
+ cpu->CP15[CP15_DOMAIN_ACCESS_CONTROL] = value;
}
else if (crn == 5 && opcode_1 == 0 && crm == 0)
{
if (opcode_2 == 0)
- cpu->CP15[CP15(CP15_FAULT_STATUS)] = value;
+ cpu->CP15[CP15_FAULT_STATUS] = value;
else if (opcode_2 == 1)
- cpu->CP15[CP15(CP15_INSTR_FAULT_STATUS)] = value;
+ cpu->CP15[CP15_INSTR_FAULT_STATUS] = value;
}
else if (crn == 6 && opcode_1 == 0 && crm == 0)
{
if (opcode_2 == 0)
- cpu->CP15[CP15(CP15_FAULT_ADDRESS)] = value;
+ cpu->CP15[CP15_FAULT_ADDRESS] = value;
else if (opcode_2 == 1)
- cpu->CP15[CP15(CP15_WFAR)] = value;
+ cpu->CP15[CP15_WFAR] = value;
}
else if (crn == 7 && opcode_1 == 0)
{
@@ -456,56 +456,56 @@ void WriteCP15Register(ARMul_State* cpu, u32 value, u32 crn, u32 opcode_1, u32 c
if (crm == 0 && opcode_2 == 4)
{
- cpu->CP15[CP15(CP15_WAIT_FOR_INTERRUPT)] = value;
+ cpu->CP15[CP15_WAIT_FOR_INTERRUPT] = value;
}
else if (crm == 4 && opcode_2 == 0)
{
// NOTE: Not entirely accurate. This should do permission checks.
- cpu->CP15[CP15(CP15_PHYS_ADDRESS)] = Memory::VirtualToPhysicalAddress(value);
+ cpu->CP15[CP15_PHYS_ADDRESS] = Memory::VirtualToPhysicalAddress(value);
}
else if (crm == 5)
{
if (opcode_2 == 0)
- cpu->CP15[CP15(CP15_INVALIDATE_INSTR_CACHE)] = value;
+ cpu->CP15[CP15_INVALIDATE_INSTR_CACHE] = value;
else if (opcode_2 == 1)
- cpu->CP15[CP15(CP15_INVALIDATE_INSTR_CACHE_USING_MVA)] = value;
+ cpu->CP15[CP15_INVALIDATE_INSTR_CACHE_USING_MVA] = value;
else if (opcode_2 == 2)
- cpu->CP15[CP15(CP15_INVALIDATE_INSTR_CACHE_USING_INDEX)] = value;
+ cpu->CP15[CP15_INVALIDATE_INSTR_CACHE_USING_INDEX] = value;
else if (opcode_2 == 6)
- cpu->CP15[CP15(CP15_FLUSH_BRANCH_TARGET_CACHE)] = value;
+ cpu->CP15[CP15_FLUSH_BRANCH_TARGET_CACHE] = value;
else if (opcode_2 == 7)
- cpu->CP15[CP15(CP15_FLUSH_BRANCH_TARGET_CACHE_ENTRY)] = value;
+ cpu->CP15[CP15_FLUSH_BRANCH_TARGET_CACHE_ENTRY] = value;
}
else if (crm == 6)
{
if (opcode_2 == 0)
- cpu->CP15[CP15(CP15_INVALIDATE_DATA_CACHE)] = value;
+ cpu->CP15[CP15_INVALIDATE_DATA_CACHE] = value;
else if (opcode_2 == 1)
- cpu->CP15[CP15(CP15_INVALIDATE_DATA_CACHE_LINE_USING_MVA)] = value;
+ cpu->CP15[CP15_INVALIDATE_DATA_CACHE_LINE_USING_MVA] = value;
else if (opcode_2 == 2)
- cpu->CP15[CP15(CP15_INVALIDATE_DATA_CACHE_LINE_USING_INDEX)] = value;
+ cpu->CP15[CP15_INVALIDATE_DATA_CACHE_LINE_USING_INDEX] = value;
}
else if (crm == 7 && opcode_2 == 0)
{
- cpu->CP15[CP15(CP15_INVALIDATE_DATA_AND_INSTR_CACHE)] = value;
+ cpu->CP15[CP15_INVALIDATE_DATA_AND_INSTR_CACHE] = value;
}
else if (crm == 10)
{
if (opcode_2 == 0)
- cpu->CP15[CP15(CP15_CLEAN_DATA_CACHE)] = value;
+ cpu->CP15[CP15_CLEAN_DATA_CACHE] = value;
else if (opcode_2 == 1)
- cpu->CP15[CP15(CP15_CLEAN_DATA_CACHE_LINE_USING_MVA)] = value;
+ cpu->CP15[CP15_CLEAN_DATA_CACHE_LINE_USING_MVA] = value;
else if (opcode_2 == 2)
- cpu->CP15[CP15(CP15_CLEAN_DATA_CACHE_LINE_USING_INDEX)] = value;
+ cpu->CP15[CP15_CLEAN_DATA_CACHE_LINE_USING_INDEX] = value;
}
else if (crm == 14)
{
if (opcode_2 == 0)
- cpu->CP15[CP15(CP15_CLEAN_AND_INVALIDATE_DATA_CACHE)] = value;
+ cpu->CP15[CP15_CLEAN_AND_INVALIDATE_DATA_CACHE] = value;
else if (opcode_2 == 1)
- cpu->CP15[CP15(CP15_CLEAN_AND_INVALIDATE_DATA_CACHE_LINE_USING_MVA)] = value;
+ cpu->CP15[CP15_CLEAN_AND_INVALIDATE_DATA_CACHE_LINE_USING_MVA] = value;
else if (opcode_2 == 2)
- cpu->CP15[CP15(CP15_CLEAN_AND_INVALIDATE_DATA_CACHE_LINE_USING_INDEX)] = value;
+ cpu->CP15[CP15_CLEAN_AND_INVALIDATE_DATA_CACHE_LINE_USING_INDEX] = value;
}
}
else if (crn == 8 && opcode_1 == 0)
@@ -515,104 +515,104 @@ void WriteCP15Register(ARMul_State* cpu, u32 value, u32 crn, u32 opcode_1, u32 c
if (crm == 5)
{
if (opcode_2 == 0)
- cpu->CP15[CP15(CP15_INVALIDATE_ITLB)] = value;
+ cpu->CP15[CP15_INVALIDATE_ITLB] = value;
else if (opcode_2 == 1)
- cpu->CP15[CP15(CP15_INVALIDATE_ITLB_SINGLE_ENTRY)] = value;
+ cpu->CP15[CP15_INVALIDATE_ITLB_SINGLE_ENTRY] = value;
else if (opcode_2 == 2)
- cpu->CP15[CP15(CP15_INVALIDATE_ITLB_ENTRY_ON_ASID_MATCH)] = value;
+ cpu->CP15[CP15_INVALIDATE_ITLB_ENTRY_ON_ASID_MATCH] = value;
else if (opcode_2 == 3)
- cpu->CP15[CP15(CP15_INVALIDATE_ITLB_ENTRY_ON_MVA)] = value;
+ cpu->CP15[CP15_INVALIDATE_ITLB_ENTRY_ON_MVA] = value;
}
else if (crm == 6)
{
if (opcode_2 == 0)
- cpu->CP15[CP15(CP15_INVALIDATE_DTLB)] = value;
+ cpu->CP15[CP15_INVALIDATE_DTLB] = value;
else if (opcode_2 == 1)
- cpu->CP15[CP15(CP15_INVALIDATE_DTLB_SINGLE_ENTRY)] = value;
+ cpu->CP15[CP15_INVALIDATE_DTLB_SINGLE_ENTRY] = value;
else if (opcode_2 == 2)
- cpu->CP15[CP15(CP15_INVALIDATE_DTLB_ENTRY_ON_ASID_MATCH)] = value;
+ cpu->CP15[CP15_INVALIDATE_DTLB_ENTRY_ON_ASID_MATCH] = value;
else if (opcode_2 == 3)
- cpu->CP15[CP15(CP15_INVALIDATE_DTLB_ENTRY_ON_MVA)] = value;
+ cpu->CP15[CP15_INVALIDATE_DTLB_ENTRY_ON_MVA] = value;
}
else if (crm == 7)
{
if (opcode_2 == 0)
- cpu->CP15[CP15(CP15_INVALIDATE_UTLB)] = value;
+ cpu->CP15[CP15_INVALIDATE_UTLB] = value;
else if (opcode_2 == 1)
- cpu->CP15[CP15(CP15_INVALIDATE_UTLB_SINGLE_ENTRY)] = value;
+ cpu->CP15[CP15_INVALIDATE_UTLB_SINGLE_ENTRY] = value;
else if (opcode_2 == 2)
- cpu->CP15[CP15(CP15_INVALIDATE_UTLB_ENTRY_ON_ASID_MATCH)] = value;
+ cpu->CP15[CP15_INVALIDATE_UTLB_ENTRY_ON_ASID_MATCH] = value;
else if (opcode_2 == 3)
- cpu->CP15[CP15(CP15_INVALIDATE_UTLB_ENTRY_ON_MVA)] = value;
+ cpu->CP15[CP15_INVALIDATE_UTLB_ENTRY_ON_MVA] = value;
}
}
else if (crn == 9 && opcode_1 == 0 && crm == 0 && opcode_2 == 0)
{
- cpu->CP15[CP15(CP15_DATA_CACHE_LOCKDOWN)] = value;
+ cpu->CP15[CP15_DATA_CACHE_LOCKDOWN] = value;
}
else if (crn == 10 && opcode_1 == 0)
{
if (crm == 0 && opcode_2 == 0)
{
- cpu->CP15[CP15(CP15_TLB_LOCKDOWN)] = value;
+ cpu->CP15[CP15_TLB_LOCKDOWN] = value;
}
else if (crm == 2)
{
if (opcode_2 == 0)
- cpu->CP15[CP15(CP15_PRIMARY_REGION_REMAP)] = value;
+ cpu->CP15[CP15_PRIMARY_REGION_REMAP] = value;
else if (opcode_2 == 1)
- cpu->CP15[CP15(CP15_NORMAL_REGION_REMAP)] = value;
+ cpu->CP15[CP15_NORMAL_REGION_REMAP] = value;
}
}
else if (crn == 13 && opcode_1 == 0 && crm == 0)
{
if (opcode_2 == 0)
- cpu->CP15[CP15(CP15_PID)] = value;
+ cpu->CP15[CP15_PID] = value;
else if (opcode_2 == 1)
- cpu->CP15[CP15(CP15_CONTEXT_ID)] = value;
+ cpu->CP15[CP15_CONTEXT_ID] = value;
else if (opcode_2 == 3)
- cpu->CP15[CP15(CP15_THREAD_URO)] = value;
+ cpu->CP15[CP15_THREAD_URO] = value;
else if (opcode_2 == 4)
- cpu->CP15[CP15(CP15_THREAD_PRW)] = value;
+ cpu->CP15[CP15_THREAD_PRW] = value;
}
else if (crn == 15)
{
if (opcode_1 == 0 && crm == 12)
{
if (opcode_2 == 0)
- cpu->CP15[CP15(CP15_PERFORMANCE_MONITOR_CONTROL)] = value;
+ cpu->CP15[CP15_PERFORMANCE_MONITOR_CONTROL] = value;
else if (opcode_2 == 1)
- cpu->CP15[CP15(CP15_CYCLE_COUNTER)] = value;
+ cpu->CP15[CP15_CYCLE_COUNTER] = value;
else if (opcode_2 == 2)
- cpu->CP15[CP15(CP15_COUNT_0)] = value;
+ cpu->CP15[CP15_COUNT_0] = value;
else if (opcode_2 == 3)
- cpu->CP15[CP15(CP15_COUNT_1)] = value;
+ cpu->CP15[CP15_COUNT_1] = value;
}
else if (opcode_1 == 5)
{
if (crm == 4)
{
if (opcode_2 == 2)
- cpu->CP15[CP15(CP15_READ_MAIN_TLB_LOCKDOWN_ENTRY)] = value;
+ cpu->CP15[CP15_READ_MAIN_TLB_LOCKDOWN_ENTRY] = value;
else if (opcode_2 == 4)
- cpu->CP15[CP15(CP15_WRITE_MAIN_TLB_LOCKDOWN_ENTRY)] = value;
+ cpu->CP15[CP15_WRITE_MAIN_TLB_LOCKDOWN_ENTRY] = value;
}
else if (crm == 5 && opcode_2 == 2)
{
- cpu->CP15[CP15(CP15_MAIN_TLB_LOCKDOWN_VIRT_ADDRESS)] = value;
+ cpu->CP15[CP15_MAIN_TLB_LOCKDOWN_VIRT_ADDRESS] = value;
}
else if (crm == 6 && opcode_2 == 2)
{
- cpu->CP15[CP15(CP15_MAIN_TLB_LOCKDOWN_PHYS_ADDRESS)] = value;
+ cpu->CP15[CP15_MAIN_TLB_LOCKDOWN_PHYS_ADDRESS] = value;
}
else if (crm == 7 && opcode_2 == 2)
{
- cpu->CP15[CP15(CP15_MAIN_TLB_LOCKDOWN_ATTRIBUTE)] = value;
+ cpu->CP15[CP15_MAIN_TLB_LOCKDOWN_ATTRIBUTE] = value;
}
}
else if (opcode_1 == 7 && crm == 1 && opcode_2 == 0)
{
- cpu->CP15[CP15(CP15_TLB_DEBUG_CONTROL)] = value;
+ cpu->CP15[CP15_TLB_DEBUG_CONTROL] = value;
}
}
}
@@ -620,18 +620,18 @@ void WriteCP15Register(ARMul_State* cpu, u32 value, u32 crn, u32 opcode_1, u32 c
// Unprivileged registers
if (crn == 7 && opcode_1 == 0 && crm == 5 && opcode_2 == 4)
{
- cpu->CP15[CP15(CP15_FLUSH_PREFETCH_BUFFER)] = value;
+ cpu->CP15[CP15_FLUSH_PREFETCH_BUFFER] = value;
}
else if (crn == 7 && opcode_1 == 0 && crm == 10)
{
if (opcode_2 == 4)
- cpu->CP15[CP15(CP15_DATA_SYNC_BARRIER)] = value;
+ cpu->CP15[CP15_DATA_SYNC_BARRIER] = value;
else if (opcode_2 == 5)
- cpu->CP15[CP15(CP15_DATA_MEMORY_BARRIER)] = value;
+ cpu->CP15[CP15_DATA_MEMORY_BARRIER] = value;
}
else if (crn == 13 && opcode_1 == 0 && crm == 0 && opcode_2 == 2)
{
- cpu->CP15[CP15(CP15_THREAD_UPRW)] = value;
+ cpu->CP15[CP15_THREAD_UPRW] = value;
}
}
diff --git a/src/core/arm/skyeye_common/arm_regformat.h b/src/core/arm/skyeye_common/arm_regformat.h
index c232376e0..d125dc2fc 100644
--- a/src/core/arm/skyeye_common/arm_regformat.h
+++ b/src/core/arm/skyeye_common/arm_regformat.h
@@ -51,17 +51,23 @@ enum {
EXCLUSIVE_STATE,
EXCLUSIVE_RESULT,
+ // VFP registers
+ VFP_BASE,
+ VFP_FPSID = VFP_BASE,
+ VFP_FPSCR,
+ VFP_FPEXC,
+
+ MAX_REG_NUM,
+};
+
+enum CP15Register {
// c0 - Information registers
- CP15_BASE,
- CP15_C0 = CP15_BASE,
- CP15_C0_C0 = CP15_C0,
- CP15_MAIN_ID = CP15_C0_C0,
+ CP15_MAIN_ID,
CP15_CACHE_TYPE,
CP15_TCM_STATUS,
CP15_TLB_TYPE,
CP15_CPU_ID,
- CP15_C0_C1,
- CP15_PROCESSOR_FEATURE_0 = CP15_C0_C1,
+ CP15_PROCESSOR_FEATURE_0,
CP15_PROCESSOR_FEATURE_1,
CP15_DEBUG_FEATURE_0,
CP15_AUXILIARY_FEATURE_0,
@@ -69,24 +75,19 @@ enum {
CP15_MEMORY_MODEL_FEATURE_1,
CP15_MEMORY_MODEL_FEATURE_2,
CP15_MEMORY_MODEL_FEATURE_3,
- CP15_C0_C2,
- CP15_ISA_FEATURE_0 = CP15_C0_C2,
+ CP15_ISA_FEATURE_0,
CP15_ISA_FEATURE_1,
CP15_ISA_FEATURE_2,
CP15_ISA_FEATURE_3,
CP15_ISA_FEATURE_4,
// c1 - Control registers
- CP15_C1_C0,
- CP15_CONTROL = CP15_C1_C0,
+ CP15_CONTROL,
CP15_AUXILIARY_CONTROL,
CP15_COPROCESSOR_ACCESS_CONTROL,
// c2 - Translation table registers
- CP15_C2,
- CP15_C2_C0 = CP15_C2,
- CP15_TRANSLATION_BASE = CP15_C2_C0,
- CP15_TRANSLATION_BASE_TABLE_0 = CP15_TRANSLATION_BASE,
+ CP15_TRANSLATION_BASE_TABLE_0,
CP15_TRANSLATION_BASE_TABLE_1,
CP15_TRANSLATION_BASE_CONTROL,
CP15_DOMAIN_ACCESS_CONTROL,
@@ -171,14 +172,9 @@ enum {
CP15_TLB_FAULT_ADDR,
CP15_TLB_FAULT_STATUS,
- // VFP registers
- VFP_BASE,
- VFP_FPSID = VFP_BASE,
- VFP_FPSCR,
- VFP_FPEXC,
-
- MAX_REG_NUM,
+ // Not an actual register.
+ // All registers should be defined above this.
+ CP15_REGISTER_COUNT,
};
-#define CP15(idx) (idx - CP15_BASE)
#define VFP_OFFSET(x) (x - VFP_BASE)
diff --git a/src/core/arm/skyeye_common/armdefs.h b/src/core/arm/skyeye_common/armdefs.h
index d5b0242c3..12fa533f7 100644
--- a/src/core/arm/skyeye_common/armdefs.h
+++ b/src/core/arm/skyeye_common/armdefs.h
@@ -91,7 +91,7 @@ struct ARMul_State
ARMword exclusive_tag; // The address for which the local monitor is in exclusive access mode
ARMword exclusive_state;
ARMword exclusive_result;
- ARMword CP15[VFP_BASE - CP15_BASE];
+ ARMword CP15[CP15_REGISTER_COUNT];
ARMword VFP[3]; // FPSID, FPSCR, and FPEXC
// VFPv2 and VFPv3-D16 has 16 doubleword registers (D0-D16 or S0-S31).
// VFPv3-D32/ASIMD may have up to 32 doubleword registers (D0-D31),
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 15:33:14 +0100