From c64e4ed48285a0c944905bc02de89c20038f428b Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 15 Jan 1996 21:50:28 +0000 Subject: updates from Tony Bennett for PA and UNIX ports --- cpukit/libcsupport/include/rtems/assoc.h | 34 ++++---- cpukit/libcsupport/include/rtems/error.h | 14 ++- cpukit/libcsupport/include/rtems/libcsupport.h | 6 +- cpukit/libcsupport/src/assoc.c | 77 +++++++++-------- cpukit/libcsupport/src/error.c | 15 ++-- cpukit/libcsupport/src/libio.c | 5 +- cpukit/libcsupport/src/no_libc.c | 2 +- cpukit/libmisc/monitor/mon-monitor.c | 37 +++++--- cpukit/libmisc/monitor/mon-prmisc.c | 2 +- cpukit/libmisc/monitor/monitor.h | 4 +- cpukit/rtems/include/rtems/rtems/types.h | 8 +- cpukit/score/cpu/hppa1.1/cpu.c | 113 +++++++++++++++---------- cpukit/score/cpu/unix/cpu.c | 42 ++++++--- cpukit/score/include/rtems/system.h | 15 ++-- cpukit/score/inline/rtems/score/address.inl | 2 +- cpukit/score/inline/rtems/score/coremsg.inl | 2 + cpukit/score/inline/rtems/score/thread.inl | 14 ++- 17 files changed, 233 insertions(+), 159 deletions(-) (limited to 'cpukit') diff --git a/cpukit/libcsupport/include/rtems/assoc.h b/cpukit/libcsupport/include/rtems/assoc.h index c820cfa973..f9a444374c 100644 --- a/cpukit/libcsupport/include/rtems/assoc.h +++ b/cpukit/libcsupport/include/rtems/assoc.h @@ -1,5 +1,5 @@ /* - * @(#)assoc.h 1.2 - 95/06/28 + * @(#)assoc.h 1.4 - 95/10/25 * * * Rtems associativity routines. Mainly used to convert a value from @@ -13,7 +13,7 @@ #define _INCLUDE_ASSOC_H typedef struct { - char *name; + const char *name; unsigned32 local_value; unsigned32 remote_value; } rtems_assoc_t; @@ -24,21 +24,21 @@ typedef struct { #define RTEMS_ASSOC_DEFAULT_NAME "(default)" -rtems_assoc_t *rtems_assoc_ptr_by_name(rtems_assoc_t *, char *); -rtems_assoc_t *rtems_assoc_ptr_by_value(rtems_assoc_t *, unsigned32); -rtems_assoc_t *rtems_assoc_ptr_by_remote(rtems_assoc_t *, unsigned32); - -unsigned32 rtems_assoc_remote_by_local(rtems_assoc_t *, unsigned32); -unsigned32 rtems_assoc_local_by_remote(rtems_assoc_t *, unsigned32); -unsigned32 rtems_assoc_remote_by_name(rtems_assoc_t *, char *); -unsigned32 rtems_assoc_local_by_name(rtems_assoc_t *, char *); -char *rtems_assoc_name_by_local(rtems_assoc_t *, unsigned32); -char *rtems_assoc_name_by_remote(rtems_assoc_t *, unsigned32); - -unsigned32 rtems_assoc_remote_by_local_bitfield(rtems_assoc_t *, unsigned32); -char *rtems_assoc_name_by_local_bitfield(rtems_assoc_t *, unsigned32, char *); -char *rtems_assoc_name_by_remote_bitfield(rtems_assoc_t *, unsigned32, char *); -unsigned32 rtems_assoc_local_by_remote_bitfield(rtems_assoc_t *ap, unsigned32); +const rtems_assoc_t *rtems_assoc_ptr_by_name(const rtems_assoc_t *, const char *); +const rtems_assoc_t *rtems_assoc_ptr_by_value(const rtems_assoc_t *, unsigned32); +const rtems_assoc_t *rtems_assoc_ptr_by_remote(const rtems_assoc_t *, unsigned32); + +unsigned32 rtems_assoc_remote_by_local(const rtems_assoc_t *, unsigned32); +unsigned32 rtems_assoc_local_by_remote(const rtems_assoc_t *, unsigned32); +unsigned32 rtems_assoc_remote_by_name(const rtems_assoc_t *, const char *); +unsigned32 rtems_assoc_local_by_name(const rtems_assoc_t *, const char *); +const char *rtems_assoc_name_by_local(const rtems_assoc_t *, unsigned32); +const char *rtems_assoc_name_by_remote(const rtems_assoc_t *, unsigned32); + +unsigned32 rtems_assoc_remote_by_local_bitfield(const rtems_assoc_t *, unsigned32); +char *rtems_assoc_name_by_local_bitfield(const rtems_assoc_t *, unsigned32, char *); +char *rtems_assoc_name_by_remote_bitfield(const rtems_assoc_t *, unsigned32, char *); +unsigned32 rtems_assoc_local_by_remote_bitfield(const rtems_assoc_t *, unsigned32); #endif /* ! _INCLUDE_ASSOC_H */ diff --git a/cpukit/libcsupport/include/rtems/error.h b/cpukit/libcsupport/include/rtems/error.h index a41f0aa534..621ee16f65 100644 --- a/cpukit/libcsupport/include/rtems/error.h +++ b/cpukit/libcsupport/include/rtems/error.h @@ -1,5 +1,6 @@ + /* - * @(#)error.h 1.1 - 95/08/02 + * @(#)error.h 1.3 - 95/10/25 * * * Defines and externs for rtems error reporting @@ -7,6 +8,9 @@ * $Id$ */ +#ifndef __RTEMS_ERROR_h +#define __RTEMS_ERROR_h + /* * rtems_error() and rtems_panic() support */ @@ -18,9 +22,11 @@ #define RTEMS_ERROR_MASK (RTEMS_ERROR_ERRNO | RTEMS_ERROR_ABORT | \ RTEMS_ERROR_PANIC) /* all */ -char *rtems_status_text(rtems_status_code); -int rtems_error(int error_code, char *printf_format, ...); -void rtems_panic(char *printf_format, ...); +const char *rtems_status_text(rtems_status_code); +int rtems_error(int error_code, const char *printf_format, ...); +void rtems_panic(const char *printf_format, ...); extern int rtems_panic_in_progress; +#endif +/* end of include file */ diff --git a/cpukit/libcsupport/include/rtems/libcsupport.h b/cpukit/libcsupport/include/rtems/libcsupport.h index 063246f4e5..f43cd189e1 100644 --- a/cpukit/libcsupport/include/rtems/libcsupport.h +++ b/cpukit/libcsupport/include/rtems/libcsupport.h @@ -29,14 +29,14 @@ void RTEMS_Malloc_Initialize( size_t sbrk_amount ); +extern void malloc_dump(void); extern void libc_init(int reentrant); +extern int host_errno(void); +extern void fix_syscall_errno(void); #ifdef __cplusplus } #endif -extern int host_errno(void); -extern void fix_syscall_errno(void); - #endif /* end of include file */ diff --git a/cpukit/libcsupport/src/assoc.c b/cpukit/libcsupport/src/assoc.c index c18359ef8a..a3eabdb3b5 100644 --- a/cpukit/libcsupport/src/assoc.c +++ b/cpukit/libcsupport/src/assoc.c @@ -1,6 +1,6 @@ /* - * @(#)assoc.c 1.4 - 95/08/02 - * + * @(#)assoc.c 1.6 - 95/10/25 + * * * assoc.c * rtems assoc routines @@ -8,7 +8,6 @@ * $Id$ */ - #include #include "assoc.h" @@ -18,13 +17,13 @@ #define STREQ(a,b) (strcmp((a), (b)) == 0) #define rtems_assoc_is_default(ap) ((ap)->name && STREQ(ap->name, RTEMS_ASSOC_DEFAULT_NAME)) -rtems_assoc_t * +const rtems_assoc_t * rtems_assoc_ptr_by_name( - rtems_assoc_t *ap, - char *name + const rtems_assoc_t *ap, + const char *name ) { - rtems_assoc_t *default_ap = 0; + const rtems_assoc_t *default_ap = 0; if (rtems_assoc_is_default(ap)) default_ap = ap++; @@ -36,13 +35,13 @@ rtems_assoc_ptr_by_name( return default_ap; } -rtems_assoc_t * +const rtems_assoc_t * rtems_assoc_ptr_by_local( - rtems_assoc_t *ap, + const rtems_assoc_t *ap, unsigned32 local_value ) { - rtems_assoc_t *default_ap = 0; + const rtems_assoc_t *default_ap = 0; if (rtems_assoc_is_default(ap)) default_ap = ap++; @@ -55,13 +54,13 @@ rtems_assoc_ptr_by_local( } -rtems_assoc_t * +const rtems_assoc_t * rtems_assoc_ptr_by_remote( - rtems_assoc_t *ap, + const rtems_assoc_t *ap, unsigned32 remote_value ) { - rtems_assoc_t *default_ap = 0; + const rtems_assoc_t *default_ap = 0; if (rtems_assoc_is_default(ap)) default_ap = ap++; @@ -80,11 +79,11 @@ rtems_assoc_ptr_by_remote( unsigned32 rtems_assoc_remote_by_local( - rtems_assoc_t *ap, + const rtems_assoc_t *ap, unsigned32 local_value ) { - rtems_assoc_t *nap; + const rtems_assoc_t *nap; nap = rtems_assoc_ptr_by_local(ap, local_value); if (nap) return nap->remote_value; @@ -94,11 +93,11 @@ rtems_assoc_remote_by_local( unsigned32 rtems_assoc_local_by_remote( - rtems_assoc_t *ap, + const rtems_assoc_t *ap, unsigned32 remote_value ) { - rtems_assoc_t *nap; + const rtems_assoc_t *nap; nap = rtems_assoc_ptr_by_remote(ap, remote_value); if (nap) return nap->local_value; @@ -108,11 +107,11 @@ rtems_assoc_local_by_remote( unsigned32 rtems_assoc_remote_by_name( - rtems_assoc_t *ap, - char *name + const rtems_assoc_t *ap, + const char *name ) { - rtems_assoc_t *nap; + const rtems_assoc_t *nap; nap = rtems_assoc_ptr_by_name(ap, name); if (nap) return nap->remote_value; @@ -122,11 +121,11 @@ rtems_assoc_remote_by_name( unsigned32 rtems_assoc_local_by_name( - rtems_assoc_t *ap, - char *name + const rtems_assoc_t *ap, + const char *name ) { - rtems_assoc_t *nap; + const rtems_assoc_t *nap; nap = rtems_assoc_ptr_by_name(ap, name); if (nap) return nap->local_value; @@ -139,25 +138,29 @@ rtems_assoc_local_by_name( * this is not reentrant, but it really shouldn't be invoked anyway */ -char * +const char * rtems_assoc_name_bad( unsigned32 bad_value ) { +#ifdef RTEMS_DEBUG static char bad_buffer[32]; sprintf(bad_buffer, "< %d [0x%x] >", bad_value, bad_value); +#else + static char bad_buffer[32] = ""; +#endif return bad_buffer; } -char * +const char * rtems_assoc_name_by_local( - rtems_assoc_t *ap, + const rtems_assoc_t *ap, unsigned32 local_value ) { - rtems_assoc_t *nap; + const rtems_assoc_t *nap; nap = rtems_assoc_ptr_by_local(ap, local_value); if (nap) return nap->name; @@ -165,13 +168,13 @@ rtems_assoc_name_by_local( return rtems_assoc_name_bad(local_value); } -char * +const char * rtems_assoc_name_by_remote( - rtems_assoc_t *ap, + const rtems_assoc_t *ap, unsigned32 remote_value ) { - rtems_assoc_t *nap; + const rtems_assoc_t *nap; nap = rtems_assoc_ptr_by_remote(ap, remote_value); if (nap) return nap->name; @@ -185,7 +188,7 @@ rtems_assoc_name_by_remote( */ unsigned32 rtems_assoc_remote_by_local_bitfield( - rtems_assoc_t *ap, + const rtems_assoc_t *ap, unsigned32 local_value ) { @@ -201,7 +204,7 @@ unsigned32 rtems_assoc_remote_by_local_bitfield( unsigned32 rtems_assoc_local_by_remote_bitfield( - rtems_assoc_t *ap, + const rtems_assoc_t *ap, unsigned32 remote_value ) { @@ -215,8 +218,9 @@ unsigned32 rtems_assoc_local_by_remote_bitfield( return local_value; } -char *rtems_assoc_name_by_remote_bitfield( - rtems_assoc_t *ap, +char * +rtems_assoc_name_by_remote_bitfield( + const rtems_assoc_t *ap, unsigned32 value, char *buffer ) @@ -236,8 +240,9 @@ char *rtems_assoc_name_by_remote_bitfield( return buffer; } -char *rtems_assoc_name_by_local_bitfield( - rtems_assoc_t *ap, +char * +rtems_assoc_name_by_local_bitfield( + const rtems_assoc_t *ap, unsigned32 value, char *buffer ) diff --git a/cpukit/libcsupport/src/error.c b/cpukit/libcsupport/src/error.c index 56224f2a56..f9cee777ae 100644 --- a/cpukit/libcsupport/src/error.c +++ b/cpukit/libcsupport/src/error.c @@ -1,10 +1,9 @@ /* - * @(#)error.c 1.2 - 95/08/02 + * @(#)error.c 1.6 - 95/12/12 * * - * report errors and panics to RTEMS' stderr. - * Currently just used by RTEMS monitor. - * + * report errors and panics to RTEMS' stderr. + * Currently just used by RTEMS monitor. * * $Id$ */ @@ -97,7 +96,7 @@ rtems_assoc_t rtems_status_assoc[] = { }; -char * +const char * rtems_status_text( rtems_status_code status ) @@ -108,7 +107,7 @@ rtems_status_text( static int rtems_verror( unsigned32 error_flag, - char *printf_format, + const char *printf_format, va_list arglist ) { @@ -181,7 +180,7 @@ static int rtems_verror( int rtems_error( int error_flag, - char *printf_format, + const char *printf_format, ... ) { @@ -200,7 +199,7 @@ int rtems_error( */ void rtems_panic( - char *printf_format, + const char *printf_format, ... ) { diff --git a/cpukit/libcsupport/src/libio.c b/cpukit/libcsupport/src/libio.c index a7ac5b2d3c..73b6adf298 100644 --- a/cpukit/libcsupport/src/libio.c +++ b/cpukit/libcsupport/src/libio.c @@ -15,12 +15,13 @@ #include /* O_RDONLY, et.al. */ #include /* O_RDONLY, et.al. */ -#include /* O_RDONLY, et.al. */ + #if defined(solaris2) #define O_NDELAY O_NONBLOCK #elif defined(RTEMS_NEWLIB) #define O_NDELAY _FNBIO #endif + #include #include /* strcmp */ #include @@ -208,7 +209,7 @@ rtems_libio_allocate(void) rc = rtems_semaphore_create( RTEMS_LIBIO_IOP_SEM(iop - rtems_libio_iops), - 1, + 1, RTEMS_BINARY_SEMAPHORE | RTEMS_INHERIT_PRIORITY | RTEMS_PRIORITY, RTEMS_NO_PRIORITY, &iop->sem diff --git a/cpukit/libcsupport/src/no_libc.c b/cpukit/libcsupport/src/no_libc.c index 43a91eb30e..9bb65f4df6 100644 --- a/cpukit/libcsupport/src/no_libc.c +++ b/cpukit/libcsupport/src/no_libc.c @@ -1,4 +1,4 @@ -#if !defined(RTEMS_LIBC) && !defined(RTEMS_NEWLIB) && !defined(RTEMS_UNIX) +#if !defined(RTEMS_NEWLIB) && !defined(RTEMS_UNIX) /* no_libc.h * diff --git a/cpukit/libmisc/monitor/mon-monitor.c b/cpukit/libmisc/monitor/mon-monitor.c index 5cf80d3ad6..98b4234c00 100644 --- a/cpukit/libmisc/monitor/mon-monitor.c +++ b/cpukit/libmisc/monitor/mon-monitor.c @@ -1,7 +1,8 @@ /* - * @(#)monitor.c 1.18 - 95/08/02 + * @(#)monitor.c 1.22 - 95/11/02 * * + * * RTEMS monitor main body * * TODO: @@ -17,6 +18,10 @@ * should have a separate monitor FILE stream (ala the debugger) * remote request/response stuff should be cleaned up * maybe we can use real rpc?? + * 'info' commadn to print out: + * interrupt stack location, direction and size + * floating point config stuff + * interrupt config stuff * * $Id$ */ @@ -227,7 +232,7 @@ rtems_monitor_command_entry_t rtems_monitor_commands[] = { " Enter the debugger, if possible.\n" " A continue from the debugger will return to the monitor.\n", 0, - CPU_INVOKE_DEBUGGER, + rtems_monitor_debugger_cmd, 0, }, #endif @@ -296,6 +301,18 @@ rtems_monitor_continue_cmd( rtems_monitor_suspend(RTEMS_NO_TIMEOUT); } +void +rtems_monitor_debugger_cmd( + int argc, + char **argv, + unsigned32 command_arg, + boolean verbose +) +{ +#ifdef CPU_INVOKE_DEBUGGER + CPU_INVOKE_DEBUGGER; +#endif +} void rtems_monitor_node_cmd( @@ -338,22 +355,14 @@ rtems_monitor_node_cmd( * 400a708c ? _Thread_Dispatch_disable_level * 400a7090 ? _Configuration_Table * - * * We ignore the type field. * - * Parameters: - * - * - * Returns: - * - * * Side Effects: * Creates and fills in 'rtems_monitor_symbols' table * - * Notes: - * - * - * Deficiencies/ToDo: + * TODO + * there should be a BSP #define or something like that + * to do this; Assuming stdio is crazy. * Someday this should know BFD * Maybe we could get objcopy to just copy the symbol areas * and copy that down. @@ -373,7 +382,7 @@ rtems_monitor_symbols_loadup(void) if (rtems_monitor_symbols == 0) return; -#ifdef simhppa +#ifdef SIMHPPA fp = fdopen(8, "r"); /* don't ask; don't tell */ #else fp = fopen("symbols", "r"); diff --git a/cpukit/libmisc/monitor/mon-prmisc.c b/cpukit/libmisc/monitor/mon-prmisc.c index 0a9f9bdf2e..6003695195 100644 --- a/cpukit/libmisc/monitor/mon-prmisc.c +++ b/cpukit/libmisc/monitor/mon-prmisc.c @@ -70,7 +70,7 @@ rtems_monitor_dump_assoc_bitfield( { unsigned32 b; unsigned32 length = 0; - char *name; + const char *name; for (b = 1; b; b <<= 1) if (b & value) diff --git a/cpukit/libmisc/monitor/monitor.h b/cpukit/libmisc/monitor/monitor.h index 2ee03f570b..2f20bd2937 100644 --- a/cpukit/libmisc/monitor/monitor.h +++ b/cpukit/libmisc/monitor/monitor.h @@ -1,6 +1,7 @@ /* - * @(#)monitor.h 1.14 - 95/08/02 + * @(#)monitor.h 1.20 - 95/12/12 * + * * $Id$ */ @@ -318,6 +319,7 @@ void rtems_monitor_wakeup(void); void rtems_monitor_pause_cmd(int, char **, unsigned32, boolean); void rtems_monitor_fatal_cmd(int, char **, unsigned32, boolean); void rtems_monitor_continue_cmd(int, char **, unsigned32, boolean); +void rtems_monitor_debugger_cmd(int, char **, unsigned32, boolean); void rtems_monitor_node_cmd(int, char **, unsigned32, boolean); void rtems_monitor_symbols_loadup(void); void rtems_monitor_task(rtems_task_argument); diff --git a/cpukit/rtems/include/rtems/rtems/types.h b/cpukit/rtems/include/rtems/rtems/types.h index 48a0c247ed..1dc8cd5373 100644 --- a/cpukit/rtems/include/rtems/rtems/types.h +++ b/cpukit/rtems/include/rtems/rtems/types.h @@ -33,12 +33,18 @@ extern "C" { typedef unsigned8 rtems_unsigned8; /* unsigned 8-bit value */ typedef unsigned16 rtems_unsigned16; /* unsigned 16-bit value */ typedef unsigned32 rtems_unsigned32; /* unsigned 32-bit value */ -typedef unsigned64 rtems_unsigned64; /* unsigned 64-bit value */ typedef signed8 rtems_signed8; /* signed 8-bit value */ typedef signed16 rtems_signed16; /* signed 16-bit value */ typedef signed32 rtems_signed32; /* signed 32-bit value */ + +/* + * some C++ compilers (eg: HP's) don't do 'long long' + */ +#if defined(__GNUC__) +typedef unsigned64 rtems_unsigned64; /* unsigned 64-bit value */ typedef signed64 rtems_signed64; /* signed 64-bit value */ +#endif typedef single_precision rtems_single; /* single precision float */ typedef double_precision rtems_double; /* double precision float */ diff --git a/cpukit/score/cpu/hppa1.1/cpu.c b/cpukit/score/cpu/hppa1.1/cpu.c index a6cddbc804..48e09b908a 100644 --- a/cpukit/score/cpu/hppa1.1/cpu.c +++ b/cpukit/score/cpu/hppa1.1/cpu.c @@ -24,29 +24,16 @@ void hppa_external_interrupt_initialize(void); void hppa_external_interrupt_enable(unsigned32); void hppa_external_interrupt_disable(unsigned32); void hppa_external_interrupt(unsigned32, CPU_Interrupt_frame *); +void hppa_cpu_halt(unsigned32); /* - * Our interrupt handlers take a 2nd argument: - * a pointer to a CPU_Interrupt_frame - * So we use our own prototype instead of rtems_isr_entry + * The first level interrupt handler for first 32 interrupts/traps. + * Indexed by vector; generally each entry is _Generic_ISR_Handler. + * Some TLB traps may have their own first level handler. */ -typedef void ( *hppa_rtems_isr_entry )( - ISR_Vector_number, - CPU_Interrupt_frame * - ); - - -/* - * who are we? cpu number - * Not used by executive proper, just kept (or not) as a convenience - * for libcpu and libbsp stuff that wants it. - * - * Defaults to 0. If the BSP doesn't like it, it can change it. - */ - -int cpu_number; /* from 0; cpu number in a multi cpu system */ - +extern void _Generic_ISR_Handler(void); +unsigned32 HPPA_first_level_interrupt_handler[HPPA_INTERNAL_INTERRUPTS]; /* _CPU_Initialize * @@ -85,6 +72,20 @@ void _CPU_Initialize( asm volatile( "stw %%r27,%0" : "=m" (_CPU_Default_gr27): ); + /* + * Init the first level interrupt handlers + */ + + for (i=0; i <= HPPA_INTERNAL_INTERRUPTS; i++) + HPPA_first_level_interrupt_handler[i] = (unsigned32) _Generic_ISR_Handler; + + /* + * Init the 2nd level interrupt handlers + */ + + for (i=0; i <= CPU_INTERRUPT_NUMBER_OF_VECTORS; i++) + _ISR_Vector_table[i] = (ISR_Handler_entry) hppa_cpu_halt; + /* * Stabilize the interrupt stuff */ @@ -96,6 +97,33 @@ void _CPU_Initialize( */ iva_table = (unsigned32) IVA_Table; +#if defined(hppa1_1) + /* + * HACK: (from PA72000 TRM, page 4-19) + * "The hardware TLB miss handler will never attempt to service + * a non-access TLB miss or a TLB protection violation. It + * will only attempt to service TLB accesses that would cause + * Trap Numbers 6 (Instruction TLB miss) and 15 (Data TLB miss)." + * + * The LPA instruction is used to translate a virtual address to + * a physical address, however, if the requested virtual address + * is not currently resident in the TLB, the hardware TLB miss + * handler will NOT insert it. In this situation Trap Number + * #17 is invoked (Non-access Data TLB miss fault). + * + * To work around this, a dummy data access is first performed + * to the virtual address prior to the LPA. The dummy access + * causes the TLB entry to be inserted (if not already present) + * and then the following LPA instruction will not generate + * a non-access data TLB miss fault. + * + * It is unclear whether or not this behaves the same way for + * the PA8000. + * + */ + iva = *(volatile unsigned32 *)iva_table; /* dummy access */ +#endif + HPPA_ASM_LPA(0, iva_table, iva); set_iva(iva); @@ -112,8 +140,8 @@ unsigned32 _CPU_ISR_Get_level(void) int level; HPPA_ASM_SSM(0, level); /* change no bits; just get copy */ if (level & HPPA_PSW_I) - return 1; - return 0; + return 0; + return 1; } /*PAGE @@ -184,12 +212,8 @@ void _CPU_ISR_install_vector( * Support for external and spurious interrupts on HPPA * * TODO: - * delete interrupt.c etc. * Count interrupts * make sure interrupts disabled properly - * should handler check again for more interrupts before exit? - * How to enable interrupts from an interrupt handler? - * Make sure there is an entry for everything in ISR_Vector_Table */ #define DISMISS(mask) set_eirr(mask) @@ -208,16 +232,14 @@ hppa_external_interrupt_initialize(void) proc_ptr ignore; /* mark them all unused */ - DISABLE(~0); DISMISS(~0); /* install the external interrupt handler */ - _CPU_ISR_install_vector( - HPPA_INTERRUPT_EXTERNAL_INTERRUPT, - (proc_ptr)hppa_external_interrupt, - &ignore - ); + _CPU_ISR_install_vector( + HPPA_INTERRUPT_EXTERNAL_INTERRUPT, + (proc_ptr)hppa_external_interrupt, &ignore +); } /* @@ -256,19 +278,21 @@ hppa_external_interrupt_spurious_handler(unsigned32 vector, printf("spurious external interrupt: %d at pc 0x%x; disabling\n", vector, iframe->Interrupt.pcoqfront); */ - DISMISS(VECTOR_TO_MASK(vector)); - DISABLE(VECTOR_TO_MASK(vector)); } void -hppa_external_interrupt_report_spurious(unsigned32 spurious, +hppa_external_interrupt_report_spurious(unsigned32 spurious_mask, CPU_Interrupt_frame *iframe) { int v; for (v=0; v < HPPA_EXTERNAL_INTERRUPTS; v++) - if (VECTOR_TO_MASK(v) & spurious) + if (VECTOR_TO_MASK(v) & spurious_mask) + { + DISMISS(VECTOR_TO_MASK(v)); + DISABLE(VECTOR_TO_MASK(v)); hppa_external_interrupt_spurious_handler(v, iframe); - DISMISS(spurious); + } + DISMISS(spurious_mask); } @@ -304,18 +328,18 @@ hppa_external_interrupt(unsigned32 vector, { DISMISS(m); mask &= ~m; - (*handler)(global_vector, iframe); + handler(global_vector, iframe); } } if (mask != 0) { if ( _CPU_Table.spurious_handler ) - (*((hppa_rtems_isr_entry) _CPU_Table.spurious_handler))( - mask, - iframe - ); + { + handler = (hppa_rtems_isr_entry) _CPU_Table.spurious_handler; + handler(mask, iframe); + } else - hppa_external_interrupt_report_spurious(mask, iframe); + hppa_external_interrupt_report_spurious(mask, iframe); } } } @@ -330,13 +354,12 @@ hppa_external_interrupt(unsigned32 vector, */ void -hppa_cpu_halt(unsigned32 type_of_halt, - unsigned32 the_error) +hppa_cpu_halt(unsigned32 the_error) { unsigned32 isrlevel; _CPU_ISR_Disable(isrlevel); - asm volatile( "copy %0,%%r1" : : "r" (the_error) ); + HPPA_ASM_LABEL("_hppa_cpu_halt"); HPPA_ASM_BREAK(1, 0); } diff --git a/cpukit/score/cpu/unix/cpu.c b/cpukit/score/cpu/unix/cpu.c index c77276020b..de3e6a7118 100644 --- a/cpukit/score/cpu/unix/cpu.c +++ b/cpukit/score/cpu/unix/cpu.c @@ -87,7 +87,7 @@ void _CPU_ISR_From_CPU_Init() */ sigemptyset(&posix_empty_mask); - + /* * Block all the signals except SIGTRAP for the debugger * and SIGABRT for fatal errors. @@ -602,7 +602,6 @@ void _CPU_ISR_Handler(int vector) extern unsigned32 _Thread_Dispatch_disable_level; extern boolean _Context_Switch_necessary; - if (_ISR_Nest_level++ == 0) { /* switch to interrupt stack */ } @@ -635,19 +634,34 @@ void _CPU_ISR_Handler(int vector) void _CPU_Stray_signal(int sig_num) { - char buffer[ 4 ]; - - /* - * We avoid using the stdio section of the library. - * The following is generally safe. + char buffer[ 4 ]; + + /* + * print "stray" msg about ones which that might mean something + * Avoid using the stdio section of the library. + * The following is generally safe. */ - - buffer[ 0 ] = (sig_num >> 4) + 0x30; - buffer[ 1 ] = (sig_num & 0xf) + 0x30; - buffer[ 2 ] = '\n'; - - write( 2, "Stray signal 0x", 12 ); - write( 2, buffer, 3 ); + + switch (sig_num) + { + case SIGCLD: + break; + + default: + { + /* + * We avoid using the stdio section of the library. + * The following is generally safe. + */ + + buffer[ 0 ] = (sig_num >> 4) + 0x30; + buffer[ 1 ] = (sig_num & 0xf) + 0x30; + buffer[ 2 ] = '\n'; + + write( 2, "Stray signal 0x", 12 ); + write( 2, buffer, 3 ); + } + } /* * If it was a "fatal" signal, then exit here diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h index 22ae606342..9b50159c81 100644 --- a/cpukit/score/include/rtems/system.h +++ b/cpukit/score/include/rtems/system.h @@ -56,14 +56,15 @@ extern "C" { */ #ifdef USE_INLINES -#define STATIC static -#define INLINE __inline__ +# define STATIC static +# ifdef __GNUC__ +# define INLINE __inline__ +# else +# define INLINE inline +# endif #else -/* -#error Only the GNU C compiler is currently supported!!! -*/ -#define STATIC -#define INLINE +# define STATIC +# define INLINE #endif /* diff --git a/cpukit/score/inline/rtems/score/address.inl b/cpukit/score/inline/rtems/score/address.inl index dd2a789b1e..c1bb098577 100644 --- a/cpukit/score/inline/rtems/score/address.inl +++ b/cpukit/score/inline/rtems/score/address.inl @@ -58,7 +58,7 @@ STATIC INLINE unsigned32 _Addresses_Subtract ( void *right ) { - return (left - right); + return ((char *) left - (char *) right); } /*PAGE diff --git a/cpukit/score/inline/rtems/score/coremsg.inl b/cpukit/score/inline/rtems/score/coremsg.inl index 6431979dd3..5a1b5d4a10 100644 --- a/cpukit/score/inline/rtems/score/coremsg.inl +++ b/cpukit/score/inline/rtems/score/coremsg.inl @@ -17,6 +17,8 @@ #ifndef __CORE_MESSAGE_QUEUE_inl #define __CORE_MESSAGE_QUEUE_inl +#include /* needed for memcpy */ + /*PAGE * * _CORE_message_queue_Send diff --git a/cpukit/score/inline/rtems/score/thread.inl b/cpukit/score/inline/rtems/score/thread.inl index e326410112..3a96acf4ea 100644 --- a/cpukit/score/inline/rtems/score/thread.inl +++ b/cpukit/score/inline/rtems/score/thread.inl @@ -241,30 +241,36 @@ STATIC INLINE Thread_Control *_Thread_Get ( { Objects_Classes the_class; Objects_Information *information; + Thread_Control *tp = (Thread_Control *) 0; if ( _Objects_Are_ids_equal( id, OBJECTS_ID_OF_SELF ) ) { _Thread_Disable_dispatch(); *location = OBJECTS_LOCAL; - return( _Thread_Executing ); + tp = _Thread_Executing; + goto done; } the_class = _Objects_Get_class( id ); if ( the_class > OBJECTS_CLASSES_LAST ) { *location = OBJECTS_ERROR; - return (Thread_Control *) 0; + goto done; } information = _Objects_Information_table[ the_class ]; if ( !information || !information->is_thread ) { *location = OBJECTS_ERROR; - return (Thread_Control *) 0; + goto done; } - return (Thread_Control *) _Objects_Get( information, id, location ); + tp = (Thread_Control *) _Objects_Get( information, id, location ); + +done: + return tp; } + /* * _Thread_Is_proxy_blocking * -- cgit v1.2.3