Index: arch/sparc64/src/trap/exception.c =================================================================== --- arch/sparc64/src/trap/exception.c (revision 778c1e13481e0b5687b788ccd214d7053813f24c) +++ arch/sparc64/src/trap/exception.c (revision 4a2b52ff4fbc7a2272782d2183f8358003e7c20f) @@ -28,4 +28,5 @@ #include +#include #include @@ -41,2 +42,8 @@ panic("Memory Address Not Aligned\n"); } + +/** Handle mem_address_not_aligned. */ +void do_illegal_instruction(void) +{ + panic("Illegal Instruction: %P\n", tpc_read()); +} Index: arch/sparc64/src/trap/trap.c =================================================================== --- arch/sparc64/src/trap/trap.c (revision 778c1e13481e0b5687b788ccd214d7053813f24c) +++ arch/sparc64/src/trap/trap.c (revision 4a2b52ff4fbc7a2272782d2183f8358003e7c20f) @@ -43,81 +43,3 @@ void trap_init(void) { - /* - * Save kernel provided trap handlers. - */ - memcpy((void *) trap_table_save, (void *) trap_table, TRAP_TABLE_SIZE); - - /* - * Copy OFW's trap table into kernel. - */ - memcpy((void *) trap_table, (void *) tba_read(), TRAP_TABLE_SIZE); - - /* - * Install kernel-provided handlers. - */ - trap_install_handler(TT_INSTRUCTION_ACCESS_EXCEPTION, TRAP_TABLE_ENTRY_SIZE, false); - trap_install_handler(TT_CLEAN_WINDOW, CLEAN_WINDOW_HANDLER_SIZE, false); - trap_install_handler(TT_MEM_ADDRESS_NOT_ALIGNED, TRAP_TABLE_ENTRY_SIZE, false); - trap_install_handler(TT_SPILL_0_NORMAL, SPILL_HANDLER_SIZE, false); - trap_install_handler(TT_FILL_0_NORMAL, FILL_HANDLER_SIZE, false); - trap_install_handler(TT_INSTRUCTION_ACCESS_EXCEPTION, TRAP_TABLE_ENTRY_SIZE, true); - trap_install_handler(TT_CLEAN_WINDOW, CLEAN_WINDOW_HANDLER_SIZE, true); - trap_install_handler(TT_MEM_ADDRESS_NOT_ALIGNED, TRAP_TABLE_ENTRY_SIZE, true); - trap_install_handler(TT_SPILL_0_NORMAL, SPILL_HANDLER_SIZE, true); - trap_install_handler(TT_FILL_0_NORMAL, FILL_HANDLER_SIZE, true); - trap_install_handler(TT_INTERRUPT_LEVEL_1, INTERRUPT_LEVEL_N_HANDLER_SIZE, false); - trap_install_handler(TT_INTERRUPT_LEVEL_2, INTERRUPT_LEVEL_N_HANDLER_SIZE, false); - trap_install_handler(TT_INTERRUPT_LEVEL_3, INTERRUPT_LEVEL_N_HANDLER_SIZE, false); - trap_install_handler(TT_INTERRUPT_LEVEL_4, INTERRUPT_LEVEL_N_HANDLER_SIZE, false); - trap_install_handler(TT_INTERRUPT_LEVEL_5, INTERRUPT_LEVEL_N_HANDLER_SIZE, false); - trap_install_handler(TT_INTERRUPT_LEVEL_6, INTERRUPT_LEVEL_N_HANDLER_SIZE, false); - trap_install_handler(TT_INTERRUPT_LEVEL_7, INTERRUPT_LEVEL_N_HANDLER_SIZE, false); - trap_install_handler(TT_INTERRUPT_LEVEL_8, INTERRUPT_LEVEL_N_HANDLER_SIZE, false); - trap_install_handler(TT_INTERRUPT_LEVEL_9, INTERRUPT_LEVEL_N_HANDLER_SIZE, false); - trap_install_handler(TT_INTERRUPT_LEVEL_10, INTERRUPT_LEVEL_N_HANDLER_SIZE, false); - trap_install_handler(TT_INTERRUPT_LEVEL_11, INTERRUPT_LEVEL_N_HANDLER_SIZE, false); - trap_install_handler(TT_INTERRUPT_LEVEL_12, INTERRUPT_LEVEL_N_HANDLER_SIZE, false); - trap_install_handler(TT_INTERRUPT_LEVEL_13, INTERRUPT_LEVEL_N_HANDLER_SIZE, false); - trap_install_handler(TT_INTERRUPT_LEVEL_14, INTERRUPT_LEVEL_N_HANDLER_SIZE, false); - trap_install_handler(TT_INTERRUPT_LEVEL_15, INTERRUPT_LEVEL_N_HANDLER_SIZE, false); - trap_install_handler(TT_INTERRUPT_VECTOR_TRAP, INTERRUPT_VECTOR_TRAP_HANDLER_SIZE, false); - - /* - * Kernel must become independent on Open Firmware calls before MMU handlers are enabled. - */ -/* - trap_install_handler(TT_FAST_INSTRUCTION_ACCESS_MMU_MISS, FAST_MMU_HANDLER_SIZE, false); - trap_install_handler(TT_FAST_DATA_ACCESS_MMU_MISS, FAST_MMU_HANDLER_SIZE, false); - trap_install_handler(TT_FAST_DATA_ACCESS_PROTECTION, FAST_MMU_HANDLER_SIZE, false); - trap_install_handler(TT_FAST_INSTRUCTION_ACCESS_MMU_MISS, FAST_MMU_HANDLER_SIZE, true); - trap_install_handler(TT_FAST_DATA_ACCESS_MMU_MISS, FAST_MMU_HANDLER_SIZE, true); - trap_install_handler(TT_FAST_DATA_ACCESS_PROTECTION, FAST_MMU_HANDLER_SIZE, true); -*/ - } - -/** Copy trap handler to active trap table. - * - * The handler is copied from trap_table_kernel to trap_handler. - * - * @param tt Trap type. An index that uniquelly identifies handler code. - * @param len Length of the handler in bytes. Must be multiple of TRAP_TABLE_ENTRY_SIZE (i.e. 32). - * @param tlnonz If false, tt is considered from the lower half of trap table. If true, the upper half is chosen. - */ -void trap_install_handler(index_t tt, size_t len, bool tlnonz) -{ - count_t cnt; - int i; - - ASSERT(tt < TRAP_TABLE_ENTRY_COUNT/2); - ASSERT(len % TRAP_TABLE_ENTRY_SIZE == 0); - - if (tlnonz) - tt += TRAP_TABLE_ENTRY_COUNT/2; - - cnt = len/TRAP_TABLE_ENTRY_SIZE; - - for (i = tt; i < tt + cnt; i++) { - trap_table[i] = trap_table_save[i]; - } -} Index: arch/sparc64/src/trap/trap_table.S =================================================================== --- arch/sparc64/src/trap/trap_table.S (revision 778c1e13481e0b5687b788ccd214d7053813f24c) +++ arch/sparc64/src/trap/trap_table.S (revision 4a2b52ff4fbc7a2272782d2183f8358003e7c20f) @@ -28,13 +28,5 @@ /** - * This file contains two trap tables. - * First, trap_table, is the one wich contains handlers implemented by - * kernel. During initialization, these handlers are copied out to - * the second trap table, trap_table_save, and the first table is - * overwritten with copy of OFW's own trap table. The copy is then patched - * from the trap_table_save. - * - * This arrangement is beneficial because kernel handlers stay on their - * link-time addresses which is good for debugging. + * This file contains kernel trap table. */ @@ -69,4 +61,10 @@ SIMPLE_HANDLER do_instruction_access_exc +/* TT = 0x10, TL = 0, illegal_instruction */ +.org trap_table + TT_ILLEGAL_INSTRUCTION*ENTRY_SIZE +.global illegal_instruction +illegal_instruction: + SIMPLE_HANDLER do_illegal_instruction + /* TT = 0x24, TL = 0, clean_window handler */ .org trap_table + TT_CLEAN_WINDOW*ENTRY_SIZE @@ -217,4 +215,10 @@ SIMPLE_HANDLER do_instruction_access_exc +/* TT = 0x10, TL > 0, illegal_instruction */ +.org trap_table + (TT_ILLEGAL_INSTRUCTION+512)*ENTRY_SIZE +.global illegal_instruction_high +illegal_instruction_high: + SIMPLE_HANDLER do_illegal_instruction + /* TT = 0x24, TL > 0, clean_window handler */ .org trap_table + (TT_CLEAN_WINDOW+512)*ENTRY_SIZE @@ -258,14 +262,4 @@ fill_0_normal_high: FILL_NORMAL_HANDLER - - - -/* - * Save trap table. - */ -.align TABLE_SIZE -.global trap_table_save -trap_table_save: - .space TABLE_SIZE, 0