From f05b2ac0bc4626e854afc6e6a5d1b88071adbd7c Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 21 Apr 2004 16:01:48 +0000 Subject: Remove duplicate white lines. --- .../lib/libbsp/mips/genmongoosev/clock/clockdrv.c | 4 - .../lib/libbsp/mips/genmongoosev/console/conscfg.c | 2 - c/src/lib/libbsp/mips/genmongoosev/include/bsp.h | 12 --- .../lib/libbsp/mips/genmongoosev/include/lr333x0.h | 1 - c/src/lib/libbsp/mips/genmongoosev/start/mg5.h | 24 ------ c/src/lib/libbsp/mips/genmongoosev/start/start.S | 49 ------------ .../libbsp/mips/genmongoosev/startup/bspstart.c | 13 ---- .../libbsp/mips/genmongoosev/startup/gdb-support.c | 15 ---- c/src/lib/libbsp/mips/genmongoosev/timer/timer.c | 1 - c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c | 1 - c/src/lib/libbsp/mips/jmr3904/console/console-io.c | 1 - c/src/lib/libbsp/mips/jmr3904/start/start.S | 1 - c/src/lib/libbsp/mips/jmr3904/startup/bspstart.c | 1 - c/src/lib/libbsp/mips/p4000/console/console.c | 6 -- c/src/lib/libbsp/mips/p4000/console/led.S | 2 - c/src/lib/libbsp/mips/p4000/start/start.S | 10 --- c/src/lib/libbsp/mips/p4000/startup/bspclean.c | 2 - c/src/lib/libbsp/mips/p4000/startup/idtmem.S | 13 ---- c/src/lib/libbsp/mips/p4000/startup/idttlb.S | 3 - c/src/lib/libbsp/mips/p4000/startup/setvec.c | 1 - c/src/lib/libbsp/mips/shared/gdbstub/gdb_if.h | 9 --- c/src/lib/libbsp/mips/shared/gdbstub/memlimits.h | 1 - c/src/lib/libbsp/mips/shared/gdbstub/mips-stub.c | 90 ---------------------- 23 files changed, 262 deletions(-) (limited to 'c/src/lib/libbsp/mips') diff --git a/c/src/lib/libbsp/mips/genmongoosev/clock/clockdrv.c b/c/src/lib/libbsp/mips/genmongoosev/clock/clockdrv.c index 6fa22a4b13..6fca49089c 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/clock/clockdrv.c +++ b/c/src/lib/libbsp/mips/genmongoosev/clock/clockdrv.c @@ -23,8 +23,6 @@ #define CLOCK_VECTOR MONGOOSEV_IRQ_TIMER1 #endif - - /* reset Timeout (TO) bit */ #define Clock_driver_support_at_tick() \ @@ -33,13 +31,11 @@ (MONGOOSEV_TIMER_CONTROL_COUNTER_ENABLE | MONGOOSEV_TIMER_CONTROL_INTERRUPT_ENABLE)); \ } while(0) - #define Clock_driver_support_install_isr( _new, _old ) \ do { \ _old = set_vector( _new, CLOCK_VECTOR, 1 ); \ } while(0) - #define Clock_driver_support_initialize_hardware() \ do { \ uint32_t _clicks = CPU_CLOCK_RATE_MHZ * rtems_configuration_get_microseconds_per_tick(); \ diff --git a/c/src/lib/libbsp/mips/genmongoosev/console/conscfg.c b/c/src/lib/libbsp/mips/genmongoosev/console/conscfg.c index 1ae41b405a..e837e142e4 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/console/conscfg.c +++ b/c/src/lib/libbsp/mips/genmongoosev/console/conscfg.c @@ -26,7 +26,6 @@ #define MG5UART_FUNCTIONS &mg5uart_fns_polled #endif - console_tbl Console_Port_Tbl[] = { { "/dev/com0", /* sDeviceName */ @@ -80,7 +79,6 @@ console_data Console_Port_Data[NUM_CONSOLE_PORTS]; rtems_device_minor_number Console_Port_Minor; - /* * printk() support that simply routes printk to stderr */ diff --git a/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h b/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h index 3beb8dc513..fbd54b3254 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h +++ b/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h @@ -28,7 +28,6 @@ extern "C" { #include #include - #ifndef CPU_CLOCK_RATE #define CLOCK_RATE 12000000 #endif @@ -36,15 +35,12 @@ extern "C" { #define CPU_CLOCK_RATE_HZ CLOCK_RATE #define CPU_CLOCK_RATE_MHZ (CLOCK_RATE/1000000) - /* * Useful defines set here so we can avoid duplicating them all over * creation. * */ - - /* * assertSoftwareInt defined in vectorisrs.c the prototype is here so * userspace code can get to it directly. @@ -52,10 +48,6 @@ extern "C" { extern void assertSoftwareInterrupt(uint32_t); - - - - /* * Define the time limits for RTEMS Test Suite test durations. * Long test and short test duration limits are provided. These @@ -74,10 +66,8 @@ extern void assertSoftwareInterrupt(uint32_t); * */ - #define CLOCK_VECTOR MONGOOSEV_IRQ_TIMER1 - #define MUST_WAIT_FOR_INTERRUPT 1 #if 1 @@ -85,8 +75,6 @@ extern void assertSoftwareInterrupt(uint32_t); #define Install_tm27_vector( handler ) \ (void) set_vector( handler, MONGOOSEV_IRQ_SOFTWARE_1, 1 ); - - #define Cause_tm27_intr() assertSoftwareInterrupt(0); #define Clear_tm27_intr() diff --git a/c/src/lib/libbsp/mips/genmongoosev/include/lr333x0.h b/c/src/lib/libbsp/mips/genmongoosev/include/lr333x0.h index d9f258a46e..ef0a44ebaf 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/include/lr333x0.h +++ b/c/src/lib/libbsp/mips/genmongoosev/include/lr333x0.h @@ -174,7 +174,6 @@ IMPORT BOOL sysICset0; /* inst cache set 0 present ? */ #define LR33300_DC_SIZE 0x800 /* 33300 Data cache = 2Kbytes */ #define LR33310_DC_SIZE 0x1000 /* 33310 Data cache = 4Kbytes */ - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/mips/genmongoosev/start/mg5.h b/c/src/lib/libbsp/mips/genmongoosev/start/mg5.h index 12776c8fc3..8d54133d64 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/start/mg5.h +++ b/c/src/lib/libbsp/mips/genmongoosev/start/mg5.h @@ -9,8 +9,6 @@ */ #define PMON_ADDRESS 0xbfc00000 - - /* ** Mongoose V Peripheral Function Registers */ @@ -65,7 +63,6 @@ #define MG5_MAVN_RANGE_4_REG 0xfffe01d0 /* Range 4 */ #define MG5_MAVN_RANGE_5_REG 0xfffe01d4 /* Range 5 */ - /* ** Uart Specific Peripheral Function Registers */ @@ -76,7 +73,6 @@ #define MG5_UART_1_TX_REG 0xfffe01f8 #define MG5_UART_1_BAUD_REG 0xfffe01fc - /* ** Section 2: Bit definitions ** @@ -106,7 +102,6 @@ #define UART_CTSN_TEST_BIT 0x00000004 #define UART_RESET_BIT 0x00000002 - /* ** Interrupt Status/Cause/Mask register bits - from 31 to 0 */ @@ -138,7 +133,6 @@ #define EXTERN_INT_1_BIT 0x00000002 #define EXTERN_INT_0_BIT 0x00000001 - /* ** MAVN Range Bits */ @@ -152,7 +146,6 @@ #define MAVN_GLOBAL_WRITE_BIT 0x00000200 - #define MAVN_RANGE_0_READ_BIT 0x00000400 #define MAVN_RANGE_1_READ_BIT 0x00000800 #define MAVN_RANGE_2_READ_BIT 0x00001000 @@ -239,11 +232,6 @@ #define MAVN_START_ADDR_MASK 0xFFFFFE00 #define MAVN_PS_CODE_MASK 0x0000001F - - - - - /* lr33000.h - defines for LSI Logic LR33000 */ /* Define counter/timer register addresses */ @@ -268,11 +256,6 @@ /* lr33000.h */ - - - - - #define _LR33300_ #define M_SRAM 0xfffe0100 /* SRAM config reg */ @@ -340,12 +323,6 @@ /* _LR33300_ */ - - - - - - #define _ERNIE_CORE_ #define M_BIU 0xfffe0130 @@ -396,7 +373,6 @@ /* _ERNIE_CORE_ */ - /* Definitions for cache sizes */ #define LR33300_IC_SIZE 0x1000 /* 33300 Inst cache = 4Kbytes */ diff --git a/c/src/lib/libbsp/mips/genmongoosev/start/start.S b/c/src/lib/libbsp/mips/genmongoosev/start/start.S index 5c997d7449..3861510259 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/start/start.S +++ b/c/src/lib/libbsp/mips/genmongoosev/start/start.S @@ -37,19 +37,15 @@ #define LANGUAGE_ASSEMBLY #endif - #include #include "regs.S" #include "mg5.h" - - #ifdef __mips16 /* This file contains 32 bit assembly code. */ .set nomips16 #endif - /* ** defined by linkcmds, pointing to the start of the relocation target ** memory, referenced in this way so we can avoid defining it @@ -60,7 +56,6 @@ .text .align 2 - /********************************************************************** ** ** Function: _start @@ -100,7 +95,6 @@ _branch: mtc0 t0, C0_CAUSE nop - /* ** Call cpuinit. Masking used to call EEPROM address of _cpuinit. Label is RAM label. */ @@ -123,8 +117,6 @@ _branch: jal t0 nop - - /* ** Print 'b'. Show that we started. */ @@ -137,10 +129,6 @@ _branch: jal t0 nop - - - - li k0,0 li k1,0 @@ -157,8 +145,6 @@ _branch: srl t0,31 /* shift high bit down to bit 0 */ bnez t0,1f /* booting from above kseg1 */ - - /* ** Call IcacheFlush. Masking used to call EEPROM address of IcacheFlush. Label is RAM label. */ @@ -171,7 +157,6 @@ _branch: jal t0 nop - /* ** Print 'I'. Show that we flushed I cache. */ @@ -184,7 +169,6 @@ _branch: jal t0 nop - /* ** Call DcacheFlush. Masking used to call EEPROM address of DcacheFlush. Label is RAM label. */ @@ -196,7 +180,6 @@ _branch: jal t0 nop - /* ** Print 'D'. Show that we flushed D cache. */ @@ -210,7 +193,6 @@ _branch: jal t0 nop - 1: /* ** Print ' RTEMS b'. Show that we are booting. @@ -287,7 +269,6 @@ _branch: jal t0 nop - /* ** get the address of the _branch label above as it would appear in ** the relocated code @@ -335,7 +316,6 @@ relocate: nop .end _start - /********************************************************************** ** ** Function: _start_in_ram @@ -355,7 +335,6 @@ _start_in_ram: la gp, _gp /* set the global data pointer */ .end _start_in_ram - /********************************************************************** ** ** Function: zerobss @@ -405,7 +384,6 @@ zerobss: .end zerobss - /********************************************************************** ** ** Function: _init @@ -422,7 +400,6 @@ _initialize_rtems: jal putch_rom nop - /* ** Save the boot-time addresses of the I & D cache flush routines. ** Note, if we're running from RAM, we cannot manipulate the cache @@ -447,7 +424,6 @@ _initialize_rtems: nop .end _initialize_rtems - /********************************************************************** ** ** Function: _sys_exit @@ -461,8 +437,6 @@ _sys_exit: jal t0 .end _sys_exit - - /********************************************************************** ** ** function: putch @@ -506,7 +480,6 @@ putch_rom: j ra .end putch_rom - /********************************************************************** ** ** function: config_uart @@ -543,7 +516,6 @@ config_uart: j ra .end config_uart - /************************************************************* * CpuInit: * Perform CPU-specific initialization @@ -670,7 +642,6 @@ _cpuinit: li t0, 0x0 sw t0,M_SPEC2 - /* ** SPEC3 Setup ** SPEC3 will be used for the SONIC ethernet controller. @@ -797,14 +768,6 @@ _cpuinit: j ra .end _cpuinit - - - - - - - - /********************************************************************** ** ** Keep the boot-time address of the I & D cache reset code for @@ -816,8 +779,6 @@ _cpuinit: _promIcache: .word 0 _promDcache: .word 0 - - .globl promCopyIcacheFlush .ent promCopyIcacheFlush .set noreorder @@ -837,8 +798,6 @@ promCopyIcacheFlush: .set reorder .end promCopyIcacheFlush - - .globl promCopyDcacheFlush .ent promCopyDcacheFlush .set noreorder @@ -858,10 +817,6 @@ promCopyDcacheFlush: .set reorder .end promCopyDcacheFlush - - - - /******************************************************************************* ** Function Name: IcacheFlush ** Description: This functions flushes the on chip icache. @@ -900,7 +855,6 @@ icache_write: bltu t8, t9, icache_write /* check to see if we are done */ nop - /* ** De-isolate I cache */ @@ -912,13 +866,11 @@ icache_write: .set reorder .end IcacheFlush - /******************************************************** ** Function Name: DcacheFlush ** Description: This functions flushes the on chip dcache. */ - .ent DcacheFlush .set noreorder DcacheFlush: @@ -955,5 +907,4 @@ dcache_write: .set reorder .end DcacheFlush - /* EOF start.S */ diff --git a/c/src/lib/libbsp/mips/genmongoosev/startup/bspstart.c b/c/src/lib/libbsp/mips/genmongoosev/startup/bspstart.c index 649cd64a0e..2447038991 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/startup/bspstart.c +++ b/c/src/lib/libbsp/mips/genmongoosev/startup/bspstart.c @@ -25,9 +25,6 @@ #include #include - - - /* * The original table from the application and our copy of it with * some changes. @@ -77,8 +74,6 @@ void bsp_pretasking_hook(void) } - - /* * bsp_start * @@ -150,9 +145,6 @@ void bsp_start( void ) mips_install_isr_entries(); } - - - void clear_cache( void ) { extern void promCopyIcacheFlush(void); /* from start.S */ @@ -162,14 +154,10 @@ void clear_cache( void ) promCopyDcacheFlush(); } - - - /* //Structure filled in by get_mem_info. - struct s_mem { unsigned int size; @@ -177,7 +165,6 @@ struct s_mem unsigned int dcsize; }; - extern uint32_t _RamSize; void get_mem_info ( struct s_mem *mem ) diff --git a/c/src/lib/libbsp/mips/genmongoosev/startup/gdb-support.c b/c/src/lib/libbsp/mips/genmongoosev/startup/gdb-support.c index 4c6ee61736..e4b11b4426 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/startup/gdb-support.c +++ b/c/src/lib/libbsp/mips/genmongoosev/startup/gdb-support.c @@ -21,7 +21,6 @@ #include #include - /* We're going to call right down into the uart driver because we're @@ -38,13 +37,8 @@ extern int mg5uart_close(int major,int minor, void *arg); extern void mg5uart_write_polled(int minor, char c ); extern int mg5uart_inbyte_nonblocking_polled(int minor); - static int debugUartEnabled = 0; - - - - int mg5rdbgOpenGDBuart(int breakoninit) { struct termios t; @@ -80,7 +74,6 @@ int mg5rdbgOpenGDBuart(int breakoninit) gdbstub_add_memsegment(0x80b00000, 0x814fffff, MEMOPT_READABLE ); gdbstub_add_memsegment(0x81500000, 0x81ffffff, MEMOPT_READABLE | MEMOPT_WRITEABLE ); - if( breakoninit ) { printf("gdbstub: GDB stub entered, connect host debugger now\n"); @@ -97,16 +90,12 @@ int mg5rdbgOpenGDBuart(int breakoninit) return RTEMS_SUCCESSFUL; } - void mg5rdbgCloseGDBuart(void) { mg5uart_close(0,1,NULL); debugUartEnabled = 0; } - - - char getDebugChar (void) { if( debugUartEnabled ) @@ -120,16 +109,12 @@ char getDebugChar (void) return 0; } - void putDebugChar (char c) { if( debugUartEnabled ) return mg5uart_write_polled(1,c); } - - - /* { * initialize hardware pc and data breakpoints to quiet state* diff --git a/c/src/lib/libbsp/mips/genmongoosev/timer/timer.c b/c/src/lib/libbsp/mips/genmongoosev/timer/timer.c index 24cf366dfb..110488e8b6 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/timer/timer.c +++ b/c/src/lib/libbsp/mips/genmongoosev/timer/timer.c @@ -96,5 +96,4 @@ void Set_find_average_overhead( Timer_driver_Find_average_overhead = find_flag; } - /* eof */ diff --git a/c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c b/c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c index 0c176366dc..104f58553b 100644 --- a/c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c +++ b/c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c @@ -33,7 +33,6 @@ *((volatile uint32_t*) 0xFFFFC01C) = 0x00000700; \ } while(0) - #define Clock_driver_support_initialize_hardware() #define Clock_driver_support_shutdown_hardware() diff --git a/c/src/lib/libbsp/mips/jmr3904/console/console-io.c b/c/src/lib/libbsp/mips/jmr3904/console/console-io.c index 9f5d59c3b0..9a77473abd 100644 --- a/c/src/lib/libbsp/mips/jmr3904/console/console-io.c +++ b/c/src/lib/libbsp/mips/jmr3904/console/console-io.c @@ -33,7 +33,6 @@ #define WRITE_UINT16( _register_, _value_ ) \ (*((volatile unsigned short *)(_register_)) = (_value_)) - /* - Board specific addresses for serial chip */ #define DIAG_BASE 0xfffff300 #define DIAG_SLCR (DIAG_BASE+0x00) diff --git a/c/src/lib/libbsp/mips/jmr3904/start/start.S b/c/src/lib/libbsp/mips/jmr3904/start/start.S index b415cfc2a7..13206bc2b6 100644 --- a/c/src/lib/libbsp/mips/jmr3904/start/start.S +++ b/c/src/lib/libbsp/mips/jmr3904/start/start.S @@ -76,7 +76,6 @@ relocate: nop .end _start - .globl _start_in_ram .ent _start_in_ram _start_in_ram: diff --git a/c/src/lib/libbsp/mips/jmr3904/startup/bspstart.c b/c/src/lib/libbsp/mips/jmr3904/startup/bspstart.c index bd41945129..3ceb9775a3 100644 --- a/c/src/lib/libbsp/mips/jmr3904/startup/bspstart.c +++ b/c/src/lib/libbsp/mips/jmr3904/startup/bspstart.c @@ -113,7 +113,6 @@ struct s_mem unsigned int dcsize; }; - void get_mem_info (mem) struct s_mem *mem; diff --git a/c/src/lib/libbsp/mips/p4000/console/console.c b/c/src/lib/libbsp/mips/p4000/console/console.c index 1183b06237..4071559166 100644 --- a/c/src/lib/libbsp/mips/p4000/console/console.c +++ b/c/src/lib/libbsp/mips/p4000/console/console.c @@ -28,7 +28,6 @@ * $Id$ */ - /* * Rather than deleting this, it is commented out to (hopefully) help * the submitter send updates. @@ -36,8 +35,6 @@ * static char _sccsid[] = "@(#)console.c 08/20/96 1.6\n"; */ - - #include #include #include @@ -46,7 +43,6 @@ char idtsim_getchar( void ); void idtsim_putchar( char c ); void mips_leddisplay( char a, char b, char c, char d ); - /* console_initialize * * This routine initializes the console IO driver. @@ -78,7 +74,6 @@ rtems_device_driver console_initialize( return RTEMS_SUCCESSFUL; } - /* is_character_ready * * This routine returns TRUE if a character is available. @@ -159,7 +154,6 @@ void outbyte( } - #if 0 static int console_fd = -1; #endif diff --git a/c/src/lib/libbsp/mips/p4000/console/led.S b/c/src/lib/libbsp/mips/p4000/console/led.S index e081ff741e..88b44ba689 100644 --- a/c/src/lib/libbsp/mips/p4000/console/led.S +++ b/c/src/lib/libbsp/mips/p4000/console/led.S @@ -6,7 +6,6 @@ #include #include - FRAME(mips_leddisplay,sp,0,ra) j ra nop @@ -16,7 +15,6 @@ FRAME(sbddisplay,sp,0,ra) j ra ENDFRAME(sbddisplay) - FRAME(sbdblank,sp,0,ra) j ra ENDFRAME(sbdblank) diff --git a/c/src/lib/libbsp/mips/p4000/start/start.S b/c/src/lib/libbsp/mips/p4000/start/start.S index 4bcd885e6a..8bf57e8b6f 100644 --- a/c/src/lib/libbsp/mips/p4000/start/start.S +++ b/c/src/lib/libbsp/mips/p4000/start/start.S @@ -35,7 +35,6 @@ LICENSED MATERIAL - PROGRAM PROPERTY OF IDT #include #include - .extern _fbss,4 /* this is defined by the linker */ .extern end,4 /* this is defined by the linker */ @@ -43,7 +42,6 @@ LICENSED MATERIAL - PROGRAM PROPERTY OF IDT .text - #define TMP_STKSIZE 1024 /************************************************************************** @@ -144,7 +142,6 @@ FRAME(start,sp,0,ra) bltu v0,v1,3b add v0,4 - /************************************************************************ ** ** Temporary Stack - needed to handle stack saves until @@ -211,14 +208,12 @@ FRAME(start,sp,0,ra) 12: #endif - /* * P_STACKSIZE is the size of the Prom Stack. * the prom stack grows downward */ #define P_STACKSIZE 0x2000 /* sets stack size to 8k */ - /************************************************************************** ** ** Permanent Stack - now know top of memory, put permanent stack there @@ -250,8 +245,6 @@ FRAME(start,sp,0,ra) jal flush_cache_nowrite /* flush Data & Instruction caches */ #endif - - /************************************************************************** ** ** If this chip supports a Translation Lookaside Buffer, clear it @@ -272,7 +265,6 @@ FRAME(start,sp,0,ra) jal init_tlb /* clear the tlb */ #endif - /************************************************************************ ** ** Initialization required if using IDT/c or libc.a, standard C Lib @@ -286,14 +278,12 @@ FRAME(start,sp,0,ra) jal idtsim_init_file /*********************** END I/O initialization **********************/ - jal boot_card jal idtsim_promexit ENDFRAME(start) - .globl sim_mem_cfg sim_mem_cfg: .set noat diff --git a/c/src/lib/libbsp/mips/p4000/startup/bspclean.c b/c/src/lib/libbsp/mips/p4000/startup/bspclean.c index ebe97dbaae..825105f539 100644 --- a/c/src/lib/libbsp/mips/p4000/startup/bspclean.c +++ b/c/src/lib/libbsp/mips/p4000/startup/bspclean.c @@ -24,8 +24,6 @@ * static char _sccsid[] = "@(#)bspclean.c 03/15/96 1.1\n"; */ - - #include #include diff --git a/c/src/lib/libbsp/mips/p4000/startup/idtmem.S b/c/src/lib/libbsp/mips/p4000/startup/idtmem.S index eb843984ea..e7744e2ef9 100644 --- a/c/src/lib/libbsp/mips/p4000/startup/idtmem.S +++ b/c/src/lib/libbsp/mips/p4000/startup/idtmem.S @@ -67,7 +67,6 @@ scache_linesize: .word 0 #endif - .text #if __mips == 1 @@ -101,7 +100,6 @@ FRAME(config_Dcache,sp, CONFIGFRM, ra) j ra ENDFRAME(config_Dcache) - /************************************************************************* ** ** Config_Icache() -- determine size of Instruction cache @@ -189,7 +187,6 @@ FRAME(_size_cache,sp,0,ra) ENDFRAME(_size_cache) .set reorder - #define FLUSHFRM (2*4) /*************************************************************************** @@ -230,7 +227,6 @@ _Dflush_done: j ra ENDFRAME(flush_Dcache) - /*************************************************************************** ** ** flush_Icache() - flush entire Instruction cache @@ -326,7 +322,6 @@ FRAME(clear_Dcache,sp,0,ra) j ra ENDFRAME(clear_Dcache) - /************************************************************************** ** ** clear_Icache(base_addr, byte_count) - flush portion of Instruction cache @@ -383,14 +378,12 @@ FRAME(clear_Icache,sp,0,ra) j ra ENDFRAME(clear_Icache) - /************************************************************************** ** ** get_mem_conf - get memory configuration ** ***************************************************************************/ - FRAME(get_mem_conf,sp,0,ra) lw t6, mem_size @@ -530,7 +523,6 @@ LEAF(_size_cache) 1: j ra END(_size_cache) - /* * void config_cache() R4000 * @@ -552,7 +544,6 @@ LEAF(config_cache) 8: j ra END(config_cache) - /* * void _init_cache() R4000 */ @@ -604,7 +595,6 @@ LEAF(_init_cache) j ra END(_init_cache) - /* * void flush_cache (void) R4000 * @@ -832,8 +822,6 @@ LEAF(clean_icache_indexed) 2: j ra END(clean_icache_indexed) - - /* * void clean_scache (unsigned kva, size_t n) R4000 * @@ -907,7 +895,6 @@ END(clean_scache_nowrite_indexed) ** ***************************************************************************/ - FRAME(get_mem_conf,sp,0,ra) lw t6, mem_size diff --git a/c/src/lib/libbsp/mips/p4000/startup/idttlb.S b/c/src/lib/libbsp/mips/p4000/startup/idttlb.S index bfe741afcc..718d568482 100644 --- a/c/src/lib/libbsp/mips/p4000/startup/idttlb.S +++ b/c/src/lib/libbsp/mips/p4000/startup/idttlb.S @@ -23,7 +23,6 @@ LICENSED MATERIAL - PROGRAM PROPERTY OF IDT $Id$ */ - /* ** idttlb.s - fetch the registers associated with and the contents ** of the tlb. @@ -34,7 +33,6 @@ LICENSED MATERIAL - PROGRAM PROPERTY OF IDT #include #include - .text #if __mips == 1 @@ -375,7 +373,6 @@ FRAME(map_tlb4000,sp,0,ra) ENDFRAME(map_tlb4000) #endif - /* ** Set current TLBPID. This assumes PID is positioned correctly in reg. ** a0. diff --git a/c/src/lib/libbsp/mips/p4000/startup/setvec.c b/c/src/lib/libbsp/mips/p4000/startup/setvec.c index ccf5b46abc..fb0e5a4824 100644 --- a/c/src/lib/libbsp/mips/p4000/startup/setvec.c +++ b/c/src/lib/libbsp/mips/p4000/startup/setvec.c @@ -29,7 +29,6 @@ * static char _sccsid[] = "@(#)setvec.c 04/25/96 1.2\n"; */ - #include #include diff --git a/c/src/lib/libbsp/mips/shared/gdbstub/gdb_if.h b/c/src/lib/libbsp/mips/shared/gdbstub/gdb_if.h index bc8efb72ae..e7bd72d615 100644 --- a/c/src/lib/libbsp/mips/shared/gdbstub/gdb_if.h +++ b/c/src/lib/libbsp/mips/shared/gdbstub/gdb_if.h @@ -32,7 +32,6 @@ struct rtems_gdb_stub_thread_info { int parse_zbreak(const char *in, int *type, unsigned char **addr, int *len); - char* mem2hstr(char *buf, const unsigned char *mem, int count); int hstr2mem(unsigned char *mem, const char *buf, int count); void set_mem_err(void); @@ -160,14 +159,8 @@ void rtems_gdb_process_query( #define NUM_REGS 72 - - - - - void mips_gdb_stub_install(int enableThreads) ; - #define MEMOPT_READABLE 1 #define MEMOPT_WRITEABLE 2 @@ -177,6 +170,4 @@ void mips_gdb_stub_install(int enableThreads) ; int gdbstub_add_memsegment(unsigned,unsigned,int); - - #endif /* _GDB_IF_H */ diff --git a/c/src/lib/libbsp/mips/shared/gdbstub/memlimits.h b/c/src/lib/libbsp/mips/shared/gdbstub/memlimits.h index e9fd03c5f2..4180b9d3c0 100644 --- a/c/src/lib/libbsp/mips/shared/gdbstub/memlimits.h +++ b/c/src/lib/libbsp/mips/shared/gdbstub/memlimits.h @@ -78,7 +78,6 @@ struct memseg #define NUM_MEMSEGS 10 - int add_memsegment(unsigned,unsigned,int); int is_readable(unsigned,unsigned); int is_writeable(unsigned,unsigned); diff --git a/c/src/lib/libbsp/mips/shared/gdbstub/mips-stub.c b/c/src/lib/libbsp/mips/shared/gdbstub/mips-stub.c index fc0f867d8b..a6920fe93b 100644 --- a/c/src/lib/libbsp/mips/shared/gdbstub/mips-stub.c +++ b/c/src/lib/libbsp/mips/shared/gdbstub/mips-stub.c @@ -210,8 +210,6 @@ static char do_threads; /* != 0 means we are supporting threads */ extern char getDebugChar (void); extern void putDebugChar (char); - - /* * The following definitions are used for the gdb stub memory map */ @@ -224,11 +222,6 @@ static int is_readable(unsigned,unsigned); static int is_writeable(unsigned,unsigned); static int is_steppable(unsigned); - - - - - /* * BUFMAX defines the maximum number of characters in the inbound & outbound * packet buffers. At least 4+(sizeof registers)*2 bytes will be needed for @@ -272,7 +265,6 @@ const char gdb_hexchars[] = "0123456789abcdef"; #define highhex(x) gdb_hexchars [(x >> 4) & 0xf] #define lowhex(x) gdb_hexchars [x & 0xf] - /* * Convert length bytes of data starting at addr into hex, placing the * result in buf. Return a pointer to the last (null) char in buf. @@ -359,7 +351,6 @@ hex (char ch) return (-1); } - /* * Convert a string from hex to int until a non-hex digit * is found. Return the number of characters processed. @@ -389,7 +380,6 @@ hexToInt (char **ptr, int *intValue) return (numChars); } - /* * Convert a string from hex to long long until a non-hex * digit is found. Return the number of characters processed. @@ -419,7 +409,6 @@ hexToLongLong (char **ptr, long long *intValue) return (numChars); } - /* * Convert the hex array buf into binary, placing the result at the * specified address. If the conversion fails at any point (i.e., @@ -506,7 +495,6 @@ hex2mem (char *buf, void *_addr, int length) return 1; } - /* Convert the binary stream in BUF to memory. Gdb will escape $, #, and the escape char (0x7d). @@ -544,7 +532,6 @@ bin2mem ( return mem; } - /* * Scan the input stream for a sequence for the form $#. @@ -597,7 +584,6 @@ getpacket (char *buffer) while (checksum != xmitcsum); } - /* * Get a positive/negative acknowledgment for a transmitted packet. */ @@ -615,7 +601,6 @@ getAck (void) return c; } - /* * Send the packet in buffer and wait for a positive acknowledgement. */ @@ -665,11 +650,6 @@ putpacket (char *buffer) while (getAck () != '+'); } - - - - - /* * Saved instruction data for single step support @@ -681,7 +661,6 @@ static struct } instrBuffer; - /* * If a step breakpoint was planted restore the saved instruction. */ @@ -696,7 +675,6 @@ undoSStep (void) instrBuffer.savedInstr = NOP_INSTR; } - /* * If a single step is requested put a temporary breakpoint at the instruction * which logically follows the next one to be executed. If the next instruction @@ -818,7 +796,6 @@ doSStep (void) break; } - if( is_steppable((unsigned)instrBuffer.targetAddr) && *(instrBuffer.targetAddr) != BREAK_INSTR ) { instrBuffer.savedInstr = *instrBuffer.targetAddr; @@ -832,10 +809,6 @@ doSStep (void) return; } - - - - /* * Translate the R4600 exception code into a Unix-compatible signal. @@ -945,7 +918,6 @@ void gdb_stub_report_exception_info( *optr++ = '\0'; } - /* @@ -954,15 +926,12 @@ void gdb_stub_report_exception_info( */ CPU_Interrupt_frame current_thread_registers; - - /* * This function handles all exceptions. It only does two things: * it figures out why it was activated and tells gdb, and then it * reacts to gdb's requests. */ - void handle_exception (rtems_vector_number vector, CPU_Interrupt_frame *frame) { int host_has_detached = 0; @@ -975,7 +944,6 @@ void handle_exception (rtems_vector_number vector, CPU_Interrupt_frame *frame) void *regptr; int binary; - registers = (mips_register_t *)frame; thread = 0; @@ -986,7 +954,6 @@ void handle_exception (rtems_vector_number vector, CPU_Interrupt_frame *frame) #endif current_thread = thread; - { /* reapply all breakpoints regardless of how we came in */ struct z0break *z0, *zother; @@ -1002,8 +969,6 @@ void handle_exception (rtems_vector_number vector, CPU_Interrupt_frame *frame) } } - - /* see if we're coming from a breakpoint */ if( *((unsigned *)frame->epc) == BREAK_INSTR ) { @@ -1040,16 +1005,10 @@ void handle_exception (rtems_vector_number vector, CPU_Interrupt_frame *frame) } } - - - - /* reply to host that an exception has occurred with some basic info */ gdb_stub_report_exception_info(vector, frame, thread); putpacket (outBuffer); - - while (!(host_has_detached)) { outBuffer[0] = '\0'; getpacket (inBuffer); @@ -1079,7 +1038,6 @@ void handle_exception (rtems_vector_number vector, CPU_Interrupt_frame *frame) mem2hex (regptr, NUM_REGS * (sizeof registers), outBuffer); break; - case 'G': /* set the values of the CPU registers - return OK */ regptr = registers; #if defined(GDB_STUB_ENABLE_THREAD_SUPPORT) @@ -1092,7 +1050,6 @@ void handle_exception (rtems_vector_number vector, CPU_Interrupt_frame *frame) strcpy (outBuffer, "E00"); /* E00 = bad "set register" command */ break; - case 'P': /* Pn...=r... Write register n... with value r... - return OK */ ptr = &inBuffer[1]; @@ -1107,7 +1064,6 @@ void handle_exception (rtems_vector_number vector, CPU_Interrupt_frame *frame) strcpy (outBuffer, "E00"); /* E00 = bad "set register" command */ break; - case 'm': /* mAA..AA,LLLL Read LLLL bytes at address AA..AA */ ptr = &inBuffer[1]; @@ -1121,7 +1077,6 @@ void handle_exception (rtems_vector_number vector, CPU_Interrupt_frame *frame) strcpy (outBuffer, "E01"); /* E01 = bad 'm' command */ break; - case 'X': /* XAA..AA,LLLL:#cs */ binary = 1; case 'M': @@ -1142,8 +1097,6 @@ void handle_exception (rtems_vector_number vector, CPU_Interrupt_frame *frame) strcpy (outBuffer, "E02"); /* E02 = bad 'M' command */ break; - - case 'c': /* cAA..AA Continue at address AA..AA(optional) */ case 's': @@ -1159,10 +1112,6 @@ void handle_exception (rtems_vector_number vector, CPU_Interrupt_frame *frame) } goto stubexit; - - - - case 'k': /* remove all zbreaks if any */ dumpzbreaks: { @@ -1193,10 +1142,6 @@ void handle_exception (rtems_vector_number vector, CPU_Interrupt_frame *frame) } break; - - - - case 'q': /* queries */ #if defined(GDB_STUB_ENABLE_THREAD_SUPPORT) rtems_gdb_process_query( inBuffer, outBuffer, do_threads, thread ); @@ -1281,9 +1226,6 @@ void handle_exception (rtems_vector_number vector, CPU_Interrupt_frame *frame) #endif break; - - - case 'Z': /* Add breakpoint */ { int ret, type, len; @@ -1326,7 +1268,6 @@ void handle_exception (rtems_vector_number vector, CPU_Interrupt_frame *frame) break; } - /* Get entry */ z0 = z0break_avail; z0break_avail = z0break_avail->next; @@ -1376,13 +1317,11 @@ void handle_exception (rtems_vector_number vector, CPU_Interrupt_frame *frame) } break; - case 'z': /* remove breakpoint */ if (inBuffer[1] == 'z') { goto dumpzbreaks; - /* * zz packet - remove all breaks * z0last = NULL; @@ -1417,7 +1356,6 @@ void handle_exception (rtems_vector_number vector, CPU_Interrupt_frame *frame) unsigned *address; struct z0break *z0; - ret = parse_zbreak(inBuffer, &type, (unsigned char **)&address, &len); if (!ret) { strcpy(outBuffer, "E01"); @@ -1479,7 +1417,6 @@ void handle_exception (rtems_vector_number vector, CPU_Interrupt_frame *frame) } break; - default: /* do nothing */ break; } @@ -1510,15 +1447,6 @@ void handle_exception (rtems_vector_number vector, CPU_Interrupt_frame *frame) return; } - - - - - - - - - static int numsegs; static struct memseg memsegments[NUM_MEMSEGS]; @@ -1534,9 +1462,6 @@ int gdbstub_add_memsegment( unsigned base, unsigned end, int opts ) return RTEMS_SUCCESSFUL; } - - - static int is_readable(unsigned ptr, unsigned len) { struct memseg *ms; @@ -1554,7 +1479,6 @@ static int is_readable(unsigned ptr, unsigned len) return 0; } - static int is_writeable(unsigned ptr, unsigned len) { struct memseg *ms; @@ -1572,7 +1496,6 @@ static int is_writeable(unsigned ptr, unsigned len) return 0; } - static int is_steppable(unsigned ptr) { struct memseg *ms; @@ -1590,19 +1513,6 @@ static int is_steppable(unsigned ptr) return 0; } - - - - - - - - - - - - - static char initialized = 0; /* 0 means we are not initialized */ void mips_gdb_stub_install(int enableThreads) -- cgit v1.2.3