From 00b9d09957365896494e8d10f71c349e9eac5eda Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 7 Jun 2005 16:44:18 +0000 Subject: 2005-06-07 Brett Swimley PR 803/patch * rtems/score/cpu.h, rtems/score/m68k.h: Correct definition of _VBR. --- cpukit/score/cpu/m68k/ChangeLog | 5 +++++ cpukit/score/cpu/m68k/rtems/score/cpu.h | 2 +- cpukit/score/cpu/m68k/rtems/score/m68k.h | 10 +++++----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog index f7181ab05f..d1d4ddb85d 100644 --- a/cpukit/score/cpu/m68k/ChangeLog +++ b/cpukit/score/cpu/m68k/ChangeLog @@ -1,3 +1,8 @@ +2005-06-07 Brett Swimley + + PR 803/patch + * rtems/score/cpu.h, rtems/score/m68k.h: Correct definition of _VBR. + 2005-05-20 Chris Johns * rtems/score/cpu.h, rtems/score/m68k.h: Change declaration of _VBR. diff --git a/cpukit/score/cpu/m68k/rtems/score/cpu.h b/cpukit/score/cpu/m68k/rtems/score/cpu.h index 24926d703b..5857a772aa 100644 --- a/cpukit/score/cpu/m68k/rtems/score/cpu.h +++ b/cpukit/score/cpu/m68k/rtems/score/cpu.h @@ -224,7 +224,7 @@ typedef struct { SCORE_EXTERN void *_CPU_Interrupt_stack_low; SCORE_EXTERN void *_CPU_Interrupt_stack_high; -extern uint32_t _VBR[]; +extern void* _VBR; #if ( M68K_HAS_VBR == 0 ) diff --git a/cpukit/score/cpu/m68k/rtems/score/m68k.h b/cpukit/score/cpu/m68k/rtems/score/m68k.h index d4947748bd..d336b981f8 100644 --- a/cpukit/score/cpu/m68k/rtems/score/m68k.h +++ b/cpukit/score/cpu/m68k/rtems/score/m68k.h @@ -332,13 +332,13 @@ extern "C" { asm volatile ( "movec %0,%%vbr " : : "r" (vbr)) #elif ( M68K_COLDFIRE_ARCH == 1 ) -extern uint32_t _VBR[]; -#define m68k_get_vbr( _vbr ) _vbr = _VBR +extern void* _VBR; +#define m68k_get_vbr( _vbr ) _vbr = &_VBR -#define m68k_set_vbr( vbr ) \ +#define m68k_set_vbr( _vbr ) \ do { \ - asm volatile ( "movec %0,%%vbr " : : "r" (vbr)); \ - _VBR = (void *)vbr; \ + asm volatile ( "movec %0,%%vbr " : : "r" (_vbr)); \ + _VBR = (void *)_vbr; \ } while(0) #else -- cgit v1.2.3