Thu Apr 14 05:51:28 2011 UTC ()
- add loocoresw slot for lsw_cpu_run
- fix comments for locoresw fields


(cliff)
diff -r1.43 -r1.44 src/sys/arch/mips/mips/mipsX_subr.S
cvs diff -r1.43 -r1.44 src/sys/arch/mips/mips/mipsX_subr.S (expand / switch to unified diff)

--- src/sys/arch/mips/mips/mipsX_subr.S 2011/04/06 14:04:32 1.43
+++ src/sys/arch/mips/mips/mipsX_subr.S 2011/04/14 05:51:27 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: mipsX_subr.S,v 1.43 2011/04/06 14:04:32 tsutsui Exp $ */ 1/* $NetBSD: mipsX_subr.S,v 1.44 2011/04/14 05:51:27 cliff Exp $ */
2 2
3/* 3/*
4 * Copyright 2002 Wasabi Systems, Inc. 4 * Copyright 2002 Wasabi Systems, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Simon Burge for Wasabi Systems, Inc. 7 * Written by Simon Burge for Wasabi Systems, Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -2559,32 +2559,33 @@ _C_LABEL(MIPSX(locore_vec)): @@ -2559,32 +2559,33 @@ _C_LABEL(MIPSX(locore_vec)):
2559 PTR_WORD _C_LABEL(MIPSX(tlb_set_asid)) 2559 PTR_WORD _C_LABEL(MIPSX(tlb_set_asid))
2560 PTR_WORD _C_LABEL(MIPSX(tlb_invalidate_asids)) 2560 PTR_WORD _C_LABEL(MIPSX(tlb_invalidate_asids))
2561 PTR_WORD _C_LABEL(MIPSX(tlb_invalidate_addr)) 2561 PTR_WORD _C_LABEL(MIPSX(tlb_invalidate_addr))
2562 PTR_WORD _C_LABEL(MIPSX(tlb_invalidate_globals)) 2562 PTR_WORD _C_LABEL(MIPSX(tlb_invalidate_globals))
2563 PTR_WORD _C_LABEL(MIPSX(tlb_invalidate_all)) 2563 PTR_WORD _C_LABEL(MIPSX(tlb_invalidate_all))
2564 PTR_WORD _C_LABEL(MIPSX(tlb_record_asids)) 2564 PTR_WORD _C_LABEL(MIPSX(tlb_record_asids))
2565 PTR_WORD _C_LABEL(MIPSX(tlb_update)) 2565 PTR_WORD _C_LABEL(MIPSX(tlb_update))
2566 PTR_WORD _C_LABEL(MIPSX(tlb_enter)) 2566 PTR_WORD _C_LABEL(MIPSX(tlb_enter))
2567 PTR_WORD _C_LABEL(MIPSX(tlb_read_indexed)) 2567 PTR_WORD _C_LABEL(MIPSX(tlb_read_indexed))
2568 PTR_WORD _C_LABEL(MIPSX(tlb_write_indexed)) 2568 PTR_WORD _C_LABEL(MIPSX(tlb_write_indexed))
2569 2569
2570 .globl _C_LABEL(MIPSX(locoresw)) 2570 .globl _C_LABEL(MIPSX(locoresw))
2571_C_LABEL(MIPSX(locoresw)): 2571_C_LABEL(MIPSX(locoresw)):
2572 PTR_WORD _C_LABEL(MIPSX(wbflush)) # wbflush 2572 PTR_WORD _C_LABEL(MIPSX(wbflush)) # lsw_wbflush
2573 PTR_WORD _C_LABEL(nullop) # cpu_idle 2573 PTR_WORD _C_LABEL(nullop) # lsw_cpu_idle
2574 PTR_WORD _C_LABEL(nullop) # send ipi 2574 PTR_WORD _C_LABEL(nullop) # lsw_send_ipi
2575 PTR_WORD _C_LABEL(nullop) # cpu_offline_md 2575 PTR_WORD _C_LABEL(nullop) # lsw_cpu_offline_md
2576 PTR_WORD _C_LABEL(nullop) # cpu_init_md 2576 PTR_WORD _C_LABEL(nullop) # lsw_cpu_init
2577 PTR_WORD _C_LABEL(nullop) # lsw_bus_error 2577 PTR_WORD _C_LABEL(nullop) # lsw_cpu_run
 2578 PTR_WORD _C_LABEL(nullop) # lsw_bus_error
2578 2579
2579MIPSX(excpt_sw): 2580MIPSX(excpt_sw):
2580 #### 2581 ####
2581 #### The kernel exception handlers. 2582 #### The kernel exception handlers.
2582 #### 2583 ####
2583 PTR_WORD _C_LABEL(MIPSX(kern_intr)) # 0 external interrupt 2584 PTR_WORD _C_LABEL(MIPSX(kern_intr)) # 0 external interrupt
2584 PTR_WORD _C_LABEL(MIPSX(kern_gen_exception)) # 1 TLB modification 2585 PTR_WORD _C_LABEL(MIPSX(kern_gen_exception)) # 1 TLB modification
2585 PTR_WORD _C_LABEL(MIPSX(tlb_invalid_exception)) # 2 TLB miss (LW/I-fetch) 2586 PTR_WORD _C_LABEL(MIPSX(tlb_invalid_exception)) # 2 TLB miss (LW/I-fetch)
2586 PTR_WORD _C_LABEL(MIPSX(tlb_invalid_exception)) # 3 TLB miss (SW) 2587 PTR_WORD _C_LABEL(MIPSX(tlb_invalid_exception)) # 3 TLB miss (SW)
2587 PTR_WORD _C_LABEL(MIPSX(kern_gen_exception)) # 4 address error (LW/I-fetch) 2588 PTR_WORD _C_LABEL(MIPSX(kern_gen_exception)) # 4 address error (LW/I-fetch)
2588 PTR_WORD _C_LABEL(MIPSX(kern_gen_exception)) # 5 address error (SW) 2589 PTR_WORD _C_LABEL(MIPSX(kern_gen_exception)) # 5 address error (SW)
2589 PTR_WORD _C_LABEL(MIPSX(kern_gen_exception)) # 6 bus error (I-fetch) 2590 PTR_WORD _C_LABEL(MIPSX(kern_gen_exception)) # 6 bus error (I-fetch)
2590 PTR_WORD _C_LABEL(MIPSX(kern_gen_exception)) # 7 bus error (load or store) 2591 PTR_WORD _C_LABEL(MIPSX(kern_gen_exception)) # 7 bus error (load or store)