@@ -49,22 +49,22 @@ static const int g_exceptionRegisterNamesCount = sizeof(g_exceptionRegisterNames
4949
5050uintptr_t kscpu_framePointer (const KSMachineContext * const context )
5151{
52- return (uintptr_t )context -> machineContext .__ss . __fp ;
52+ return (uintptr_t )arm_thread_state64_get_fp ( context -> machineContext .__ss ) ;
5353}
5454
5555uintptr_t kscpu_stackPointer (const KSMachineContext * const context )
5656{
57- return (uintptr_t )context -> machineContext .__ss . __sp ;
57+ return (uintptr_t )arm_thread_state64_get_sp ( context -> machineContext .__ss ) ;
5858}
5959
6060uintptr_t kscpu_instructionAddress (const KSMachineContext * const context )
6161{
62- return (uintptr_t )context -> machineContext .__ss . __pc ;
62+ return (uintptr_t )arm_thread_state64_get_pc ( context -> machineContext .__ss ) ;
6363}
6464
6565uintptr_t kscpu_linkRegister (const KSMachineContext * const context )
6666{
67- return (uintptr_t )context -> machineContext .__ss . __lr ;
67+ return (uintptr_t )arm_thread_state64_get_lr ( context -> machineContext .__ss ) ;
6868}
6969
7070void kscpu_getState (KSMachineContext * context )
@@ -95,13 +95,13 @@ uint64_t kscpu_registerValue(const KSMachineContext *const context, const int re
9595
9696 switch (regNumber ) {
9797 case 29 :
98- return context -> machineContext .__ss . __fp ;
98+ return ( uint64_t ) arm_thread_state64_get_fp ( context -> machineContext .__ss ) ;
9999 case 30 :
100- return context -> machineContext .__ss . __lr ;
100+ return ( uint64_t ) arm_thread_state64_get_lr ( context -> machineContext .__ss ) ;
101101 case 31 :
102- return context -> machineContext .__ss . __sp ;
102+ return ( uint64_t ) arm_thread_state64_get_sp ( context -> machineContext .__ss ) ;
103103 case 32 :
104- return context -> machineContext .__ss . __pc ;
104+ return ( uint64_t ) arm_thread_state64_get_pc ( context -> machineContext .__ss ) ;
105105 case 33 :
106106 return context -> machineContext .__ss .__cpsr ;
107107 default :
0 commit comments