From 3cf5a9922388efce10545d3aa590e326d9e903ca Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Jul 2002 03:17:35 +0000 Subject: 2002-07-03 Ralf Corsepius * rtems.S: Remove. * Makefile.am: Reflect changes above. --- c/src/exec/score/cpu/hppa1.1/ChangeLog | 5 +++ c/src/exec/score/cpu/hppa1.1/Makefile.am | 7 +-- c/src/exec/score/cpu/hppa1.1/rtems.S | 77 -------------------------------- c/src/exec/score/cpu/i386/ChangeLog | 5 +++ c/src/exec/score/cpu/i386/Makefile.am | 7 +-- c/src/exec/score/cpu/i386/rtems.S | 30 ------------- c/src/exec/score/cpu/i960/ChangeLog | 5 +++ c/src/exec/score/cpu/i960/Makefile.am | 7 +-- c/src/exec/score/cpu/i960/rtems.S | 24 ---------- c/src/exec/score/cpu/m68k/ChangeLog | 5 +++ c/src/exec/score/cpu/m68k/Makefile.am | 7 +-- c/src/exec/score/cpu/m68k/rtems.S | 46 ------------------- c/src/exec/score/cpu/sparc/ChangeLog | 5 +++ c/src/exec/score/cpu/sparc/Makefile.am | 7 +-- c/src/exec/score/cpu/sparc/rtems.S | 50 --------------------- 15 files changed, 30 insertions(+), 257 deletions(-) delete mode 100644 c/src/exec/score/cpu/hppa1.1/rtems.S delete mode 100644 c/src/exec/score/cpu/i386/rtems.S delete mode 100644 c/src/exec/score/cpu/i960/rtems.S delete mode 100644 c/src/exec/score/cpu/m68k/rtems.S delete mode 100644 c/src/exec/score/cpu/sparc/rtems.S (limited to 'c/src/exec') diff --git a/c/src/exec/score/cpu/hppa1.1/ChangeLog b/c/src/exec/score/cpu/hppa1.1/ChangeLog index c955d58f26..749263fad5 100644 --- a/c/src/exec/score/cpu/hppa1.1/ChangeLog +++ b/c/src/exec/score/cpu/hppa1.1/ChangeLog @@ -1,3 +1,8 @@ +2002-07-03 Ralf Corsepius + + * rtems.S: Remove. + * Makefile.am: Reflect changes above. + 2002-07-01 Ralf Corsepius * configure.ac: Remove RTEMS_PROJECT_ROOT. diff --git a/c/src/exec/score/cpu/hppa1.1/Makefile.am b/c/src/exec/score/cpu/hppa1.1/Makefile.am index 4a049f574a..6563d63282 100644 --- a/c/src/exec/score/cpu/hppa1.1/Makefile.am +++ b/c/src/exec/score/cpu/hppa1.1/Makefile.am @@ -33,9 +33,6 @@ include_rtems_score_HEADERS = \ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) -$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o - $(INSTALL_DATA) $< $@ - C_FILES = cpu.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) @@ -49,14 +46,12 @@ rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o - all-local: $(ARCH) rtems/score/offsets.h $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ $(TMPINSTALL_FILES) .PRECIOUS: $(REL) -EXTRA_DIST = cpu.c cpu_asm.S rtems.S +EXTRA_DIST = cpu.c cpu_asm.S # FIXME: We should get rid of genoffsets GENOFFSETS = $(PROJECT_TOPdir)/tools/cpu/hppa1.1/genoffsets diff --git a/c/src/exec/score/cpu/hppa1.1/rtems.S b/c/src/exec/score/cpu/hppa1.1/rtems.S deleted file mode 100644 index c4f1c91238..0000000000 --- a/c/src/exec/score/cpu/hppa1.1/rtems.S +++ /dev/null @@ -1,77 +0,0 @@ -/* rtems.S - * - * This file contains the single entry point code for - * the HPPA implementation of RTEMS. - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#include -#include - -#if 0 -#define TEXT_SEGMENT \ - .SPACE $TEXT$ !\ - .SUBSPA $CODE$ -#define RO_SEGMENT \ - .SPACE $TEXT$ !\ - .SUBSPA $lit$ -#define DATA_SEGMENT \ - .SPACE $PRIVATE$ !\ - .SUBSPA $data$ -#define BSS_SEGMENT \ - .SPACE $PRIVATE$ !\ - .SUBSPA $bss$ -#else -#define TEXT_SEGMENT .text -#define RO_SEGMENT .rodata -#define DATA_SEGMENT .data -#define BSS_SEGMENT .bss -#endif - - -#if 0 - .SPACE $PRIVATE$ - .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31 - .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82 - .SPACE $TEXT$ - .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44 - .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY - .SPACE $TEXT$ - .SUBSPA $CODE$ -#endif - - TEXT_SEGMENT - .align 32 - .EXPORT cpu_jump_to_directive,ENTRY,PRIV_LEV=0 -cpu_jump_to_directive - .PROC - .CALLINFO FRAME=0,NO_CALLS - .ENTRY - - -# invoke user interrupt handler - -# XXX: look at register usage and code -# XXX: this is not necessarily right!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -# r9 = directive number - - .import _Entry_points,data - ldil L%_Entry_points,%r8 - ldo R%_Entry_points(%r8),%r8 - ldwx,s %r9(%r8),%r8 - - .call ARGW0=GR - bv,n 0(%r8) - nop - - .EXIT - .PROCEND - diff --git a/c/src/exec/score/cpu/i386/ChangeLog b/c/src/exec/score/cpu/i386/ChangeLog index bfd63a1242..f4ecef06de 100644 --- a/c/src/exec/score/cpu/i386/ChangeLog +++ b/c/src/exec/score/cpu/i386/ChangeLog @@ -1,3 +1,8 @@ +2002-07-03 Ralf Corsepius + + * rtems.S: Remove. + * Makefile.am: Reflect changes above. + 2002-07-01 Ralf Corsepius * configure.ac: Remove RTEMS_PROJECT_ROOT. diff --git a/c/src/exec/score/cpu/i386/Makefile.am b/c/src/exec/score/cpu/i386/Makefile.am index cb6b57ce34..efcc908a16 100644 --- a/c/src/exec/score/cpu/i386/Makefile.am +++ b/c/src/exec/score/cpu/i386/Makefile.am @@ -45,19 +45,14 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) -$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o - $(INSTALL_DATA) $< $@ - $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o - all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ $(TMPINSTALL_FILES) .PRECIOUS: $(REL) -EXTRA_DIST = cpu.c cpu_asm.S rtems.S +EXTRA_DIST = cpu.c cpu_asm.S include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/score/cpu/i386/rtems.S b/c/src/exec/score/cpu/i386/rtems.S deleted file mode 100644 index 96e7d2a0a6..0000000000 --- a/c/src/exec/score/cpu/i386/rtems.S +++ /dev/null @@ -1,30 +0,0 @@ -/* rtems.s - * - * This file contains the single entry point code for - * the i386 implementation of RTEMS. - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#include - - EXTERN (_Entry_points) - - BEGIN_CODE - - .align 2 - PUBLIC (RTEMS) - -SYM (RTEMS): - jmpl *SYM (_Entry_points)(,eax,4) - - END_CODE - -END diff --git a/c/src/exec/score/cpu/i960/ChangeLog b/c/src/exec/score/cpu/i960/ChangeLog index 08b255e62c..c8d58cda1e 100644 --- a/c/src/exec/score/cpu/i960/ChangeLog +++ b/c/src/exec/score/cpu/i960/ChangeLog @@ -1,3 +1,8 @@ +2002-07-03 Ralf Corsepius + + * rtems.S: Remove. + * Makefile.am: Reflect changes above. + 2002-07-01 Ralf Corsepius * configure.ac: Remove RTEMS_PROJECT_ROOT. diff --git a/c/src/exec/score/cpu/i960/Makefile.am b/c/src/exec/score/cpu/i960/Makefile.am index 75697ae607..4a60795a5e 100644 --- a/c/src/exec/score/cpu/i960/Makefile.am +++ b/c/src/exec/score/cpu/i960/Makefile.am @@ -31,9 +31,6 @@ include_rtems_score_HEADERS = \ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) -$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o - $(INSTALL_DATA) $< $@ - C_FILES = cpu.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) @@ -47,13 +44,11 @@ rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o - all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ $(TMPINSTALL_FILES) .PRECIOUS: $(REL) -EXTRA_DIST = cpu.c cpu_asm.S i960RP.h rtems.S +EXTRA_DIST = cpu.c cpu_asm.S i960RP.h include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/score/cpu/i960/rtems.S b/c/src/exec/score/cpu/i960/rtems.S deleted file mode 100644 index 18c6ca5a5f..0000000000 --- a/c/src/exec/score/cpu/i960/rtems.S +++ /dev/null @@ -1,24 +0,0 @@ -/* rtems.s - * - * This file contains the single entry point code for - * the i960 implementation of RTEMS. - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - - .text - - .align 4 - .globl RTEMS - -RTEMS: - ld __Entry_points[g7*4],r4 - bx (r4) - diff --git a/c/src/exec/score/cpu/m68k/ChangeLog b/c/src/exec/score/cpu/m68k/ChangeLog index 8f8973bc81..ad5e178cdb 100644 --- a/c/src/exec/score/cpu/m68k/ChangeLog +++ b/c/src/exec/score/cpu/m68k/ChangeLog @@ -1,3 +1,8 @@ +2002-07-03 Ralf Corsepius + + * rtems.S: Remove. + * Makefile.am: Reflect changes above. + 2002-07-01 Ralf Corsepius * configure.ac: Remove RTEMS_PROJECT_ROOT. diff --git a/c/src/exec/score/cpu/m68k/Makefile.am b/c/src/exec/score/cpu/m68k/Makefile.am index 975e268200..147cbfae7d 100644 --- a/c/src/exec/score/cpu/m68k/Makefile.am +++ b/c/src/exec/score/cpu/m68k/Makefile.am @@ -31,9 +31,6 @@ include_rtems_score_HEADERS = \ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) -$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o - $(INSTALL_DATA) $< $@ - C_FILES = cpu.c memcpy.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) @@ -47,13 +44,11 @@ rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o - all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ $(TMPINSTALL_FILES) .PRECIOUS: $(REL) -EXTRA_DIST = cpu.c cpu_asm.S memcpy.c rtems.S +EXTRA_DIST = cpu.c cpu_asm.S memcpy.c include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/score/cpu/m68k/rtems.S b/c/src/exec/score/cpu/m68k/rtems.S deleted file mode 100644 index 2014f0decf..0000000000 --- a/c/src/exec/score/cpu/m68k/rtems.S +++ /dev/null @@ -1,46 +0,0 @@ -/* rtems.s - * - * This file contains the single entry point code for - * the m68k implementation of RTEMS. - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - - -#include - -/* - * There seems to be no reason to have two versions of this. - * The following version should work across the entire family. - * The worst assumption is that gcc will put entry in a scratch - * register and not screw up the stack. - * - * NOTE: This is a 68020 version: - * - * jmpl @(%%d0:l:4)@(__Entry_points) - */ - - EXTERN (_Entry_points) - - BEGIN_CODE - - .align 4 - .global SYM (RTEMS) - -SYM (RTEMS): - moveal SYM (_Entry_points), a0 - lsll #2, d0 - addal d0, a0 - - moveal (a0),a0 - jmpl (a0) - - END_CODE -END diff --git a/c/src/exec/score/cpu/sparc/ChangeLog b/c/src/exec/score/cpu/sparc/ChangeLog index 70f38f25d2..e1571874f5 100644 --- a/c/src/exec/score/cpu/sparc/ChangeLog +++ b/c/src/exec/score/cpu/sparc/ChangeLog @@ -1,3 +1,8 @@ +2002-07-03 Ralf Corsepius + + * rtems.S: Remove. + * Makefile.am: Reflect changes above. + 2002-07-01 Ralf Corsepius * configure.ac: Remove RTEMS_PROJECT_ROOT. diff --git a/c/src/exec/score/cpu/sparc/Makefile.am b/c/src/exec/score/cpu/sparc/Makefile.am index b6222466f5..68153cba62 100644 --- a/c/src/exec/score/cpu/sparc/Makefile.am +++ b/c/src/exec/score/cpu/sparc/Makefile.am @@ -41,19 +41,14 @@ REL = $(ARCH)/rtems-cpu.rel rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) -$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o - $(INSTALL_DATA) $< $@ - $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o - all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ $(TMPINSTALL_FILES) .PRECIOUS: $(REL) -EXTRA_DIST = cpu.c cpu_asm.S rtems.S +EXTRA_DIST = cpu.c cpu_asm.S include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/score/cpu/sparc/rtems.S b/c/src/exec/score/cpu/sparc/rtems.S deleted file mode 100644 index ac7c66c729..0000000000 --- a/c/src/exec/score/cpu/sparc/rtems.S +++ /dev/null @@ -1,50 +0,0 @@ -/* rtems.s - * - * This file contains the single entry point code for - * the SPARC port of RTEMS. - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#include - -/* - * RTEMS - * - * This routine jumps to the directive indicated in the - * CPU defined register. This routine is used when RTEMS is - * linked by itself and placed in ROM. This routine is the - * first address in the ROM space for RTEMS. The user "calls" - * this address with the directive arguments in the normal place. - * This routine then jumps indirectly to the correct directive - * preserving the arguments. The directive should not realize - * it has been "wrapped" in this way. The table "_Entry_points" - * is used to look up the directive. - * - * void RTEMS() - */ - - .align 4 - PUBLIC(RTEMS) -SYM(RTEMS): - /* - * g2 was chosen because gcc uses it as a scratch register in - * similar code scenarios and the other locals, ins, and outs - * are off limits to this routine unless it does a "save" and - * copies its in registers to the outs which only works up until - * 6 parameters. Best to take the simple approach in this case. - */ - sethi SYM(_Entry_points), %g2 - or %g2, %lo(SYM(_Entry_points)), %g2 - sll %g1, 2, %g1 - add %g1, %g2, %g2 - jmp %g2 - nop - -- cgit v1.2.3