From d1c83050711c2579c92ee2e4888f53a6658565ab Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 22 Sep 2000 13:59:42 +0000 Subject: 2000-09-22 Joel Sherrill * Makefile.am, cpu_asm.S, psmacro.ah, rtems/score/cpu.h: First attempt to compile with GNU tools. Minor modifications to compile enough to get to assembler errors. --- c/src/exec/score/cpu/a29k/ChangeLog | 6 ++++++ c/src/exec/score/cpu/a29k/Makefile.am | 13 ++++++++----- c/src/exec/score/cpu/a29k/cpu_asm.S | 6 +++--- c/src/exec/score/cpu/a29k/pswmacro.ah | 8 ++++---- c/src/exec/score/cpu/a29k/rtems/score/cpu.h | 10 +++++----- cpukit/score/cpu/a29k/ChangeLog | 6 ++++++ cpukit/score/cpu/a29k/Makefile.am | 13 ++++++++----- cpukit/score/cpu/a29k/cpu_asm.S | 6 +++--- cpukit/score/cpu/a29k/pswmacro.ah | 8 ++++---- cpukit/score/cpu/a29k/rtems/score/cpu.h | 10 +++++----- 10 files changed, 52 insertions(+), 34 deletions(-) diff --git a/c/src/exec/score/cpu/a29k/ChangeLog b/c/src/exec/score/cpu/a29k/ChangeLog index 965f934aa1..c9d40c1324 100644 --- a/c/src/exec/score/cpu/a29k/ChangeLog +++ b/c/src/exec/score/cpu/a29k/ChangeLog @@ -1,3 +1,9 @@ +2000-09-22 Joel Sherrill + + * Makefile.am, cpu_asm.S, psmacro.ah, rtems/score/cpu.h: + First attempt to compile with GNU tools. Minor modifications + to compile enough to get to assembler errors. + 2000-09-04 Ralf Corsepius * Makefile.am: Include compile.am, remove duplicate includes. diff --git a/c/src/exec/score/cpu/a29k/Makefile.am b/c/src/exec/score/cpu/a29k/Makefile.am index 2da3c85306..6ad1a9aa81 100644 --- a/c/src/exec/score/cpu/a29k/Makefile.am +++ b/c/src/exec/score/cpu/a29k/Makefile.am @@ -5,26 +5,29 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../../../automake/compile.am -include $(top_srcdir)/../../../../../../automake/lib.am - SUBDIRS = rtems C_FILES = cpu.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = amd.ah asm.h cpu_asm.h pswmacro.ah register.ah +H_FILES = amd.ah asm.h pswmacro.ah register.ah S_FILES = cpu_asm.S sig.S S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am +include $(top_srcdir)/../../../../../../automake/lib.am + $(PROJECT_INCLUDE): $(mkinstalldirs) $@ $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/%.ah: %.ah + $(INSTALL_DATA) $< $@ + $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ diff --git a/c/src/exec/score/cpu/a29k/cpu_asm.S b/c/src/exec/score/cpu/a29k/cpu_asm.S index bfa7444f35..87da542227 100644 --- a/c/src/exec/score/cpu/a29k/cpu_asm.S +++ b/c/src/exec/score/cpu/a29k/cpu_asm.S @@ -39,9 +39,9 @@ ; */ ;#include - .include "register.ah" - .include "amd.ah" - .include "pswmacro.ah" +#include +#include +#include ; .extern _bsp_exit ; ; push a register onto the struct diff --git a/c/src/exec/score/cpu/a29k/pswmacro.ah b/c/src/exec/score/cpu/a29k/pswmacro.ah index c21eee4f35..12f6dc6abd 100644 --- a/c/src/exec/score/cpu/a29k/pswmacro.ah +++ b/c/src/exec/score/cpu/a29k/pswmacro.ah @@ -281,8 +281,8 @@ $1: nop ; add v2, rfb, 0 ; $2: - cpeq v0, v3, rfb ; fill rfb->'rfb - jmpt v0, $3 ; if rfb==rfb' + cpeq v0, v3, rfb ; fill rfb->rfb + jmpt v0, $3 ; if rfb==rfb const tav, (0x80<<2) ; prepare for fill or tav, tav, v2 ; @@ -294,12 +294,12 @@ $2: mtsr cr, tav ; loadm 0, 0, gr0, v2 ; fill from LA->rfb $3: - add rfb, v3, 0 ; move rfb upto 'rfb + add rfb, v3, 0 ; move rfb upto rfb sub rab, v1, 0 ; assign rab to rfb-512 add v0, msp, SIGCTX_GR1 ; load 0, 0, v2, v0 ; v0 = interrupted gr1 - add gr1, v2, 0 ; move gr1 upto 'gr1 + add gr1, v2, 0 ; move gr1 upto gr1 nop ; .endm diff --git a/c/src/exec/score/cpu/a29k/rtems/score/cpu.h b/c/src/exec/score/cpu/a29k/rtems/score/cpu.h index a4330123f2..34370808d1 100644 --- a/c/src/exec/score/cpu/a29k/rtems/score/cpu.h +++ b/c/src/exec/score/cpu/a29k/rtems/score/cpu.h @@ -310,7 +310,7 @@ extern void a29k_sigdfl_sup(void); * */ -#error "Check these definitions!!!" +#warning "Check these definitions!!!" #define CPU_HAS_OWN_HOST_TO_NETWORK_ROUTINES FALSE #define CPU_BIG_ENDIAN TRUE @@ -479,7 +479,7 @@ typedef struct { * _CPU_Context_Initialize. */ -EXTERN Context_Control_fp _CPU_Null_fp_context; +SCORE_EXTERN Context_Control_fp _CPU_Null_fp_context; /* * On some CPUs, RTEMS supports a software managed interrupt stack. @@ -494,8 +494,8 @@ EXTERN Context_Control_fp _CPU_Null_fp_context; * CPU_HAS_SOFTWARE_INTERRUPT_STACK is defined as TRUE. */ -EXTERN void *_CPU_Interrupt_stack_low; -EXTERN void *_CPU_Interrupt_stack_high; +SCORE_EXTERN void *_CPU_Interrupt_stack_low; +SCORE_EXTERN void *_CPU_Interrupt_stack_high; /* * With some compilation systems, it is difficult if not impossible to @@ -507,7 +507,7 @@ EXTERN void *_CPU_Interrupt_stack_high; * sequence (if a dispatch is necessary). */ -EXTERN void (*_CPU_Thread_dispatch_pointer)(); +SCORE_EXTERN void (*_CPU_Thread_dispatch_pointer)(); /* * Nothing prevents the porter from declaring more CPU specific variables. diff --git a/cpukit/score/cpu/a29k/ChangeLog b/cpukit/score/cpu/a29k/ChangeLog index 965f934aa1..c9d40c1324 100644 --- a/cpukit/score/cpu/a29k/ChangeLog +++ b/cpukit/score/cpu/a29k/ChangeLog @@ -1,3 +1,9 @@ +2000-09-22 Joel Sherrill + + * Makefile.am, cpu_asm.S, psmacro.ah, rtems/score/cpu.h: + First attempt to compile with GNU tools. Minor modifications + to compile enough to get to assembler errors. + 2000-09-04 Ralf Corsepius * Makefile.am: Include compile.am, remove duplicate includes. diff --git a/cpukit/score/cpu/a29k/Makefile.am b/cpukit/score/cpu/a29k/Makefile.am index 2da3c85306..6ad1a9aa81 100644 --- a/cpukit/score/cpu/a29k/Makefile.am +++ b/cpukit/score/cpu/a29k/Makefile.am @@ -5,26 +5,29 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../../../automake/compile.am -include $(top_srcdir)/../../../../../../automake/lib.am - SUBDIRS = rtems C_FILES = cpu.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = amd.ah asm.h cpu_asm.h pswmacro.ah register.ah +H_FILES = amd.ah asm.h pswmacro.ah register.ah S_FILES = cpu_asm.S sig.S S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am +include $(top_srcdir)/../../../../../../automake/lib.am + $(PROJECT_INCLUDE): $(mkinstalldirs) $@ $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/%.ah: %.ah + $(INSTALL_DATA) $< $@ + $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ diff --git a/cpukit/score/cpu/a29k/cpu_asm.S b/cpukit/score/cpu/a29k/cpu_asm.S index bfa7444f35..87da542227 100644 --- a/cpukit/score/cpu/a29k/cpu_asm.S +++ b/cpukit/score/cpu/a29k/cpu_asm.S @@ -39,9 +39,9 @@ ; */ ;#include - .include "register.ah" - .include "amd.ah" - .include "pswmacro.ah" +#include +#include +#include ; .extern _bsp_exit ; ; push a register onto the struct diff --git a/cpukit/score/cpu/a29k/pswmacro.ah b/cpukit/score/cpu/a29k/pswmacro.ah index c21eee4f35..12f6dc6abd 100644 --- a/cpukit/score/cpu/a29k/pswmacro.ah +++ b/cpukit/score/cpu/a29k/pswmacro.ah @@ -281,8 +281,8 @@ $1: nop ; add v2, rfb, 0 ; $2: - cpeq v0, v3, rfb ; fill rfb->'rfb - jmpt v0, $3 ; if rfb==rfb' + cpeq v0, v3, rfb ; fill rfb->rfb + jmpt v0, $3 ; if rfb==rfb const tav, (0x80<<2) ; prepare for fill or tav, tav, v2 ; @@ -294,12 +294,12 @@ $2: mtsr cr, tav ; loadm 0, 0, gr0, v2 ; fill from LA->rfb $3: - add rfb, v3, 0 ; move rfb upto 'rfb + add rfb, v3, 0 ; move rfb upto rfb sub rab, v1, 0 ; assign rab to rfb-512 add v0, msp, SIGCTX_GR1 ; load 0, 0, v2, v0 ; v0 = interrupted gr1 - add gr1, v2, 0 ; move gr1 upto 'gr1 + add gr1, v2, 0 ; move gr1 upto gr1 nop ; .endm diff --git a/cpukit/score/cpu/a29k/rtems/score/cpu.h b/cpukit/score/cpu/a29k/rtems/score/cpu.h index a4330123f2..34370808d1 100644 --- a/cpukit/score/cpu/a29k/rtems/score/cpu.h +++ b/cpukit/score/cpu/a29k/rtems/score/cpu.h @@ -310,7 +310,7 @@ extern void a29k_sigdfl_sup(void); * */ -#error "Check these definitions!!!" +#warning "Check these definitions!!!" #define CPU_HAS_OWN_HOST_TO_NETWORK_ROUTINES FALSE #define CPU_BIG_ENDIAN TRUE @@ -479,7 +479,7 @@ typedef struct { * _CPU_Context_Initialize. */ -EXTERN Context_Control_fp _CPU_Null_fp_context; +SCORE_EXTERN Context_Control_fp _CPU_Null_fp_context; /* * On some CPUs, RTEMS supports a software managed interrupt stack. @@ -494,8 +494,8 @@ EXTERN Context_Control_fp _CPU_Null_fp_context; * CPU_HAS_SOFTWARE_INTERRUPT_STACK is defined as TRUE. */ -EXTERN void *_CPU_Interrupt_stack_low; -EXTERN void *_CPU_Interrupt_stack_high; +SCORE_EXTERN void *_CPU_Interrupt_stack_low; +SCORE_EXTERN void *_CPU_Interrupt_stack_high; /* * With some compilation systems, it is difficult if not impossible to @@ -507,7 +507,7 @@ EXTERN void *_CPU_Interrupt_stack_high; * sequence (if a dispatch is necessary). */ -EXTERN void (*_CPU_Thread_dispatch_pointer)(); +SCORE_EXTERN void (*_CPU_Thread_dispatch_pointer)(); /* * Nothing prevents the porter from declaring more CPU specific variables. -- cgit v1.2.3