RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2002-06-27 Joel Sherrill <joel@OARcorp.com>

Browse Source 
* Makefile.am, cpu.c, cpu_asm.S, rtems.S: Modified to make
	this all compile again.  It has been a while since we have
	had a semi-working hppa1.1-rtems cross compiler. :)
This commit is contained in:
Joel Sherrill
2002-06-27 21:21:45 +00:00
parent d33dd2f70b
commit 6ba9c27971
9 changed files with 107 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/exec/score/cpu/hppa1.1/ChangeLog
View File

@@ -1,3 +1,9 @@
2002-06-27 Joel Sherrill <joel@OARcorp.com>
* Makefile.am, cpu.c, cpu_asm.S, rtems.S: Modified to make
this all compile again. It has been a while since we have
had a semi-working hppa1.1-rtems cross compiler. :)
2002-06-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2002-06-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Add RTEMS_PROG_CCAS * configure.ac: Add RTEMS_PROG_CCAS

11
c/src/exec/score/cpu/hppa1.1/Makefile.am
View File

@@ -20,7 +20,7 @@ $(PROJECT_INCLUDE)/rtems:
$(PROJECT_INCLUDE)/rtems/score: $(PROJECT_INCLUDE)/rtems/score:
$(mkinstalldirs) $@ $(mkinstalldirs) $@
include_HEADERS= asm.h include_HEADERS=
PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
include_rtems_scoredir = $(includedir)/rtems/score include_rtems_scoredir = $(includedir)/rtems/score
@@ -33,6 +33,9 @@ include_rtems_score_HEADERS = \
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
$(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) $(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_FILES = cpu.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
@@ -48,7 +51,7 @@ $(REL): $(rtems_cpu_rel_OBJECTS)
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o
all-local: $(ARCH) $(rtems_cpu_rel_OBJECTS) $(REL) \ all-local: $(ARCH) rtems/score/offsets.h $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
$(TMPINSTALL_FILES) $(TMPINSTALL_FILES)
.PRECIOUS: $(REL) .PRECIOUS: $(REL)
@@ -59,8 +62,8 @@ EXTRA_DIST = cpu.c cpu_asm.S rtems.S
GENOFFSETS = $(PROJECT_TOPdir)/tools/cpu/hppa1.1/genoffsets GENOFFSETS = $(PROJECT_TOPdir)/tools/cpu/hppa1.1/genoffsets
GENERIC_H_FILES = rtems/score/offsets.h GENERIC_H_FILES = rtems/score/offsets.h
rtems/score/offsets.h: $(GENOFFSETS) cpu.h rtems/score/offsets.h: $(GENOFFSETS) rtems/score/cpu.h
@(mkinstalldirs) rtems/score $(mkinstalldirs) rtems/score
$(RM) $@ $(RM) $@
$(GENOFFSETS) > $@ $(GENOFFSETS) > $@
CLEANFILES = rtems/score/offsets.h CLEANFILES = rtems/score/offsets.h

2
c/src/exec/score/cpu/hppa1.1/cpu.c
View File

@@ -178,7 +178,7 @@ hppa_cpu_halt(unsigned32 the_error)
* XXXXX NOTE: This label is only needed that that when * XXXXX NOTE: This label is only needed that that when
* the simulator stops, it shows the label name specified * the simulator stops, it shows the label name specified
*/ */
HPPA_ASM_LABEL("_hppa_cpu_halt"); /* HPPA_ASM_LABEL("_asm_hppa_cpu_halt");*/
HPPA_ASM_BREAK(0, 0); HPPA_ASM_BREAK(0, 0);
} }

28
c/src/exec/score/cpu/hppa1.1/cpu_asm.S
View File

@@ -23,6 +23,29 @@
#include <rtems/score/cpu.h> #include <rtems/score/cpu.h>
#include <rtems/score/offsets.h> #include <rtems/score/offsets.h>
#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$ .SPACE $PRIVATE$
.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31 .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82 .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
@@ -32,6 +55,9 @@
.SPACE $TEXT$ .SPACE $TEXT$
.SUBSPA $CODE$ .SUBSPA $CODE$
#endif
TEXT_SEGMENT
/* /*
* Special register usage for context switch and interrupts * Special register usage for context switch and interrupts
* Stay away from %cr28 which is used for TLB misses on 72000 * Stay away from %cr28 which is used for TLB misses on 72000
@@ -311,7 +337,7 @@ stack_done:
.import _ISR_Vector_table,data .import _ISR_Vector_table,data
ldil L%_ISR_Vector_table,%r8 ldil L%_ISR_Vector_table,%r8
ldo R%_ISR_Vector_table(%r8),%r8 ldo R%_ISR_Vector_table(%r8),%r8
ldw (%r8),%r8 ldw 0(%r8),%r8
ldwx,s %r9(%r8),%r8 ldwx,s %r9(%r8),%r8
/* /*

25
c/src/exec/score/cpu/hppa1.1/rtems.S
View File

@@ -16,6 +16,28 @@
#include <rtems/score/hppa.h> #include <rtems/score/hppa.h>
#include <rtems/score/cpu_asm.h> #include <rtems/score/cpu_asm.h>
#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$ .SPACE $PRIVATE$
.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31 .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82 .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
@@ -24,7 +46,9 @@
.SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
.SPACE $TEXT$ .SPACE $TEXT$
.SUBSPA $CODE$ .SUBSPA $CODE$
#endif
TEXT_SEGMENT
.align 32 .align 32
.EXPORT cpu_jump_to_directive,ENTRY,PRIV_LEV=0 .EXPORT cpu_jump_to_directive,ENTRY,PRIV_LEV=0
cpu_jump_to_directive cpu_jump_to_directive
@@ -32,6 +56,7 @@ cpu_jump_to_directive
.CALLINFO FRAME=0,NO_CALLS .CALLINFO FRAME=0,NO_CALLS
.ENTRY .ENTRY
# invoke user interrupt handler # invoke user interrupt handler
# XXX: look at register usage and code # XXX: look at register usage and code

6
cpukit/score/cpu/hppa1.1/ChangeLog
View File

@@ -1,3 +1,9 @@
2002-06-27 Joel Sherrill <joel@OARcorp.com>
* Makefile.am, cpu.c, cpu_asm.S, rtems.S: Modified to make
this all compile again. It has been a while since we have
had a semi-working hppa1.1-rtems cross compiler. :)
2002-06-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2002-06-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Add RTEMS_PROG_CCAS * configure.ac: Add RTEMS_PROG_CCAS

11
cpukit/score/cpu/hppa1.1/Makefile.am
View File

@@ -20,7 +20,7 @@ $(PROJECT_INCLUDE)/rtems:
$(PROJECT_INCLUDE)/rtems/score: $(PROJECT_INCLUDE)/rtems/score:
$(mkinstalldirs) $@ $(mkinstalldirs) $@
include_HEADERS= asm.h include_HEADERS=
PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
include_rtems_scoredir = $(includedir)/rtems/score include_rtems_scoredir = $(includedir)/rtems/score
@@ -33,6 +33,9 @@ include_rtems_score_HEADERS = \
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
$(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) $(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_FILES = cpu.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
@@ -48,7 +51,7 @@ $(REL): $(rtems_cpu_rel_OBJECTS)
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o
all-local: $(ARCH) $(rtems_cpu_rel_OBJECTS) $(REL) \ all-local: $(ARCH) rtems/score/offsets.h $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
$(TMPINSTALL_FILES) $(TMPINSTALL_FILES)
.PRECIOUS: $(REL) .PRECIOUS: $(REL)
@@ -59,8 +62,8 @@ EXTRA_DIST = cpu.c cpu_asm.S rtems.S
GENOFFSETS = $(PROJECT_TOPdir)/tools/cpu/hppa1.1/genoffsets GENOFFSETS = $(PROJECT_TOPdir)/tools/cpu/hppa1.1/genoffsets
GENERIC_H_FILES = rtems/score/offsets.h GENERIC_H_FILES = rtems/score/offsets.h
rtems/score/offsets.h: $(GENOFFSETS) cpu.h rtems/score/offsets.h: $(GENOFFSETS) rtems/score/cpu.h
@(mkinstalldirs) rtems/score $(mkinstalldirs) rtems/score
$(RM) $@ $(RM) $@
$(GENOFFSETS) > $@ $(GENOFFSETS) > $@
CLEANFILES = rtems/score/offsets.h CLEANFILES = rtems/score/offsets.h

2
cpukit/score/cpu/hppa1.1/cpu.c
View File

@@ -178,7 +178,7 @@ hppa_cpu_halt(unsigned32 the_error)
* XXXXX NOTE: This label is only needed that that when * XXXXX NOTE: This label is only needed that that when
* the simulator stops, it shows the label name specified * the simulator stops, it shows the label name specified
*/ */
HPPA_ASM_LABEL("_hppa_cpu_halt"); /* HPPA_ASM_LABEL("_asm_hppa_cpu_halt");*/
HPPA_ASM_BREAK(0, 0); HPPA_ASM_BREAK(0, 0);
} }

28
cpukit/score/cpu/hppa1.1/cpu_asm.S
View File

@@ -23,6 +23,29 @@
#include <rtems/score/cpu.h> #include <rtems/score/cpu.h>
#include <rtems/score/offsets.h> #include <rtems/score/offsets.h>
#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$ .SPACE $PRIVATE$
.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31 .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82 .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
@@ -32,6 +55,9 @@
.SPACE $TEXT$ .SPACE $TEXT$
.SUBSPA $CODE$ .SUBSPA $CODE$
#endif
TEXT_SEGMENT
/* /*
* Special register usage for context switch and interrupts * Special register usage for context switch and interrupts
* Stay away from %cr28 which is used for TLB misses on 72000 * Stay away from %cr28 which is used for TLB misses on 72000
@@ -311,7 +337,7 @@ stack_done:
.import _ISR_Vector_table,data .import _ISR_Vector_table,data
ldil L%_ISR_Vector_table,%r8 ldil L%_ISR_Vector_table,%r8
ldo R%_ISR_Vector_table(%r8),%r8 ldo R%_ISR_Vector_table(%r8),%r8
ldw (%r8),%r8 ldw 0(%r8),%r8
ldwx,s %r9(%r8),%r8 ldwx,s %r9(%r8),%r8
/* /*