summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2018-11-08 16:06:44 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-11-12 13:26:18 +0100
commit4539e307626b0c8ab977efa4b8eba42aa63d17ce (patch)
treeb9dbffe6cc0da1287a31a1d29dd86b362dc1a7cc
parentsparc64: Remove use of proc_ptr (diff)
downloadrtems-4539e307626b0c8ab977efa4b8eba42aa63d17ce.tar.bz2
x86_64: Remove use of proc_ptr
Update #3585.
-rw-r--r--cpukit/score/cpu/x86_64/cpu.c21
-rw-r--r--cpukit/score/cpu/x86_64/include/rtems/score/cpu.h12
-rw-r--r--cpukit/score/cpu/x86_64/x86_64-context-initialize.c2
3 files changed, 1 insertions, 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;