From 4539e307626b0c8ab977efa4b8eba42aa63d17ce Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 8 Nov 2018 16:06:44 +0100 Subject: x86_64: Remove use of proc_ptr Update #3585. --- cpukit/score/cpu/x86_64/cpu.c | 21 --------------------- cpukit/score/cpu/x86_64/include/rtems/score/cpu.h | 12 ------------ cpukit/score/cpu/x86_64/x86_64-context-initialize.c | 2 +- 3 files changed, 1 insertion(+), 34 deletions(-) diff --git a/cpukit/score/cpu/x86_64/cpu.c b/cpukit/score/cpu/x86_64/cpu.c index 0a22a1ef83..a438d31df5 100644 --- a/cpukit/score/cpu/x86_64/cpu.c +++ b/cpukit/score/cpu/x86_64/cpu.c @@ -52,24 +52,3 @@ void _CPU_Exception_frame_print(const CPU_Exception_frame *ctx) void _CPU_Initialize(void) { } - -void _CPU_ISR_install_raw_handler( - uint32_t vector, - proc_ptr new_handler, - proc_ptr *old_handler -) -{ - amd64_install_raw_interrupt( - vector, - (uintptr_t) new_handler, - (uintptr_t*) old_handler - ); -} - -void _CPU_ISR_install_vector( - uint32_t vector, - proc_ptr new_handler, - proc_ptr *old_handler -) -{ -} diff --git a/cpukit/score/cpu/x86_64/include/rtems/score/cpu.h b/cpukit/score/cpu/x86_64/include/rtems/score/cpu.h index 7f3aed3bb1..5716b7a200 100644 --- a/cpukit/score/cpu/x86_64/include/rtems/score/cpu.h +++ b/cpukit/score/cpu/x86_64/include/rtems/score/cpu.h @@ -284,18 +284,6 @@ void _CPU_Context_Initialize( void _CPU_Initialize(void); -void _CPU_ISR_install_raw_handler( - uint32_t vector, - proc_ptr new_handler, - proc_ptr *old_handler -); - -void _CPU_ISR_install_vector( - uint32_t vector, - proc_ptr new_handler, - proc_ptr *old_handler -); - void *_CPU_Thread_Idle_body( uintptr_t ignored ); void _CPU_Context_switch( diff --git a/cpukit/score/cpu/x86_64/x86_64-context-initialize.c b/cpukit/score/cpu/x86_64/x86_64-context-initialize.c index 35e7d7cb60..ee25fcfa2d 100644 --- a/cpukit/score/cpu/x86_64/x86_64-context-initialize.c +++ b/cpukit/score/cpu/x86_64/x86_64-context-initialize.c @@ -89,7 +89,7 @@ void _CPU_Context_Initialize( _stack &= ~(CPU_STACK_ALIGNMENT - 1); _stack -= sizeof(uintptr_t); /* fake return address for entry_point's frame; * this allows rsp+8 to be an aligned boundary */ - *((proc_ptr *) _stack) = entry_point; + *((void (**)(void)) _stack) = entry_point; the_context->rbp = (void *) 0; the_context->rsp = (void *) _stack; -- cgit v1.2.3