| /branches/dynload/kernel/arch/mips32/src/dummy.S |
|---|
| File deleted |
| /branches/dynload/kernel/arch/mips32/src/exception.c |
|---|
| 144,7 → 144,7 |
| int i; |
| /* decode interrupt number and process the interrupt */ |
| cause = (cp0_cause_read() >> 8) &0xff; |
| cause = (cp0_cause_read() >> 8) & 0xff; |
| for (i = 0; i < 8; i++) { |
| if (cause & (1 << i)) { |
| 153,7 → 153,7 |
| /* |
| * The IRQ handler was found. |
| */ |
| irq->handler(irq, irq->arg); |
| irq->handler(irq); |
| spinlock_unlock(&irq->lock); |
| } else { |
| /* |
| 160,7 → 160,8 |
| * Spurious interrupt. |
| */ |
| #ifdef CONFIG_DEBUG |
| printf("cpu%u: spurious interrupt (inum=%d)\n", CPU->id, i); |
| printf("cpu%u: spurious interrupt (inum=%d)\n", |
| CPU->id, i); |
| #endif |
| } |
| } |
| /branches/dynload/kernel/arch/mips32/src/asm.S |
|---|
| 27,7 → 27,7 |
| # |
| #include <arch/asm/regname.h> |
| .text |
| .macro cp0_read reg |
| 46,6 → 46,11 |
| .set noreorder |
| .set nomacro |
| .global asm_delay_loop |
| asm_delay_loop: |
| j $31 |
| nop |
| .global cpu_halt |
| cpu_halt: |
| j cpu_halt |
| /branches/dynload/kernel/arch/mips32/src/start.S |
|---|
| 31,7 → 31,7 |
| #include <arch/asm/boot.h> |
| #include <arch/context_offset.h> |
| #include <arch/stack.h> |
| .text |
| .set noat |
| 75,18 → 75,6 |
| mfhi $at |
| sw $at, EOFFSET_HI(\r) |
| #ifdef CONFIG_DEBUG_ALLREGS |
| sw $s0, EOFFSET_S0(\r) |
| sw $s1, EOFFSET_S1(\r) |
| sw $s2, EOFFSET_S2(\r) |
| sw $s3, EOFFSET_S3(\r) |
| sw $s4, EOFFSET_S4(\r) |
| sw $s5, EOFFSET_S5(\r) |
| sw $s6, EOFFSET_S6(\r) |
| sw $s7, EOFFSET_S7(\r) |
| sw $s8, EOFFSET_S8(\r) |
| #endif |
| sw $gp, EOFFSET_GP(\r) |
| sw $ra, EOFFSET_RA(\r) |
| sw $k1, EOFFSET_K1(\r) |
| 132,17 → 120,6 |
| lw $t8, EOFFSET_T8(\r) |
| lw $t9, EOFFSET_T9(\r) |
| #ifdef CONFIG_DEBUG_ALLREGS |
| lw $s0, EOFFSET_S0(\r) |
| lw $s1, EOFFSET_S1(\r) |
| lw $s2, EOFFSET_S2(\r) |
| lw $s3, EOFFSET_S3(\r) |
| lw $s4, EOFFSET_S4(\r) |
| lw $s5, EOFFSET_S5(\r) |
| lw $s6, EOFFSET_S6(\r) |
| lw $s7, EOFFSET_S7(\r) |
| lw $s8, EOFFSET_S8(\r) |
| #endif |
| lw $gp, EOFFSET_GP(\r) |
| lw $ra, EOFFSET_RA(\r) |
| lw $k1, EOFFSET_K1(\r) |
| 175,9 → 152,9 |
| ori $k0, $k0, %lo(supervisor_sp) |
| # Move $k0 (superveisor_sp) |
| lw $k0, 0($k0) |
| 1: |
| 1: |
| .endm |
| .org 0x0 |
| kernel_image_start: |
| /* Load temporary stack */ |
| 184,31 → 161,12 |
| lui $sp, %hi(end_stack) |
| ori $sp, $sp, %lo(end_stack) |
| /* $a1 contains physical address of bootinfo_t */ |
| /* $a2 contains size of bootinfo_t */ |
| beq $a2, $0, bootinfo_end |
| /* Not sure about this, but might be needed for PIC code???? */ |
| /* Not sure about this, but might |
| be needed for PIC code */ |
| lui $gp, 0x8000 |
| lui $a3, %hi(bootinfo) |
| ori $a3, $a3, %lo(bootinfo) |
| /* $a1 contains physical address of bootinfo_t */ |
| bootinfo_loop: |
| lw $v0, 0($a1) |
| sw $v0, 0($a3) |
| addi $a1, $a1, 4 |
| addi $a3, $a3, 4 |
| addi $a2, $a2, -4 |
| bgtz $a2, bootinfo_loop |
| nop |
| bootinfo_end: |
| jal arch_pre_main |
| nop |
| 228,8 → 186,8 |
| exception_entry: |
| j exception_handler |
| nop |
| nop |
| exception_handler: |
| KERNEL_STACK_TO_K0 |
| sub $k0, REGISTER_SPACE |
| 238,17 → 196,17 |
| mfc0 $k0, $cause |
| sra $k0, $k0, 0x2 # cp0_exc_cause() part 1 |
| andi $k0, $k0, 0x1f # cp0_exc_cause() part 2 |
| sub $k0, 8 # 8 = SYSCALL |
| sra $k0, $k0, 0x2 # cp0_exc_cause() part 1 |
| andi $k0, $k0, 0x1f # cp0_exc_cause() part 2 |
| sub $k0, 8 # 8 = SYSCALL |
| beqz $k0, syscall_shortcut |
| add $k0, 8 # Revert $k0 back to correct exc number |
| add $k0, 8 # Revert $k0 back to correct exc number |
| REGISTERS_STORE_AND_EXC_RESET $sp |
| move $a1, $sp |
| jal exc_dispatch # exc_dispatch(excno, register_space) |
| jal exc_dispatch # exc_dispatch(excno, register_space) |
| move $a0, $k0 |
| REGISTERS_LOAD $sp |
| /branches/dynload/kernel/arch/mips32/src/mips32.c |
|---|
| 33,7 → 33,6 |
| */ |
| #include <arch.h> |
| #include <arch/boot.h> |
| #include <arch/cp0.h> |
| #include <arch/exception.h> |
| #include <mm/as.h> |
| 58,34 → 57,39 |
| #include <arch/asm/regname.h> |
| /* Size of the code jumping to the exception handler code |
| * - J+NOP |
| /* Size of the code jumping to the exception handler code |
| * - J+NOP |
| */ |
| #define EXCEPTION_JUMP_SIZE 8 |
| #define EXCEPTION_JUMP_SIZE 8 |
| #define TLB_EXC ((char *) 0x80000000) |
| #define NORM_EXC ((char *) 0x80000180) |
| #define CACHE_EXC ((char *) 0x80000100) |
| #define TLB_EXC ((char *) 0x80000000) |
| #define NORM_EXC ((char *) 0x80000180) |
| #define CACHE_EXC ((char *) 0x80000100) |
| /* Why the linker moves the variable 64K away in assembler |
| * when not in .text section ???????? |
| * when not in .text section? |
| */ |
| /* Stack pointer saved when entering user mode */ |
| uintptr_t supervisor_sp __attribute__ ((section (".text"))); |
| /* Stack pointer saved when entering user mode */ |
| /* TODO: How do we do it on SMP system???? */ |
| bootinfo_t bootinfo __attribute__ ((section (".text"))); |
| void arch_pre_main(void) |
| count_t cpu_count = 0; |
| void arch_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo) |
| { |
| /* Setup usermode */ |
| init.cnt = bootinfo.cnt; |
| init.cnt = bootinfo->cnt; |
| uint32_t i; |
| count_t i; |
| for (i = 0; i < min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); i++) { |
| init.tasks[i].addr = bootinfo->tasks[i].addr; |
| init.tasks[i].size = bootinfo->tasks[i].size; |
| } |
| for (i = 0; i < bootinfo.cnt; i++) { |
| init.tasks[i].addr = bootinfo.tasks[i].addr; |
| init.tasks[i].size = bootinfo.tasks[i].size; |
| for (i = 0; i < CPUMAP_MAX_RECORDS; i++) { |
| if ((bootinfo->cpumap & (1 << i)) != 0) |
| cpu_count++; |
| } |
| } |
| 137,19 → 141,19 |
| fb_init(&gxemul_prop); |
| #endif |
| #ifdef msim |
| #ifdef MACHINE_msim |
| sysinfo_set_item_val("machine.msim", NULL, 1); |
| #endif |
| #ifdef simics |
| #ifdef MACHINE_simics |
| sysinfo_set_item_val("machine.simics", NULL, 1); |
| #endif |
| #ifdef bgxemul |
| #ifdef MACHINE_bgxemul |
| sysinfo_set_item_val("machine.bgxemul", NULL, 1); |
| #endif |
| #ifdef lgxemul |
| #ifdef MACHINE_lgxemul |
| sysinfo_set_item_val("machine.lgxemul", NULL, 1); |
| #endif |
| } |
| 166,6 → 170,10 |
| { |
| } |
| void calibrate_delay_loop(void) |
| { |
| } |
| void userspace(uspace_arg_t *kernel_uarg) |
| { |
| /* EXL = 1, UM = 1, IE = 1 */ |
| /branches/dynload/kernel/arch/mips32/src/smp/order.c |
|---|
| File deleted |
| /branches/dynload/kernel/arch/mips32/src/smp/dorder.c |
|---|
| 0,0 → 1,47 |
| /* |
| * Copyright (c) 2007 Martin Decky |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup mips32 |
| * @{ |
| */ |
| /** @file |
| */ |
| #include <arch/smp/dorder.h> |
| #define MSIM_DORDER_ADDRESS 0xB0000004 |
| void ipi_broadcast_arch(int ipi) |
| { |
| #ifdef CONFIG_SMP |
| *((volatile unsigned int *) MSIM_DORDER_ADDRESS) = 0x7FFFFFFF; |
| #endif |
| } |
| /** @} |
| */ |
| /branches/dynload/kernel/arch/mips32/src/smp/smp.c |
|---|
| 0,0 → 1,53 |
| /* |
| * Copyright (c) 2009 Martin Decky |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup mips32 |
| * @{ |
| */ |
| /** @file |
| */ |
| #include <config.h> |
| #include <smp/smp.h> |
| #include <arch/arch.h> |
| #ifdef CONFIG_SMP |
| void smp_init(void) |
| { |
| config.cpu_count = cpu_count; |
| } |
| void kmp(void *arg __attribute__((unused))) |
| { |
| } |
| #endif /* CONFIG_SMP */ |
| /** @} |
| */ |
| /branches/dynload/kernel/arch/mips32/src/debugger.c |
|---|
| 162,7 → 162,7 |
| for (i = 0; i < BKPOINTS_MAX; i++) { |
| if (breakpoints[i].address == (uintptr_t)argv->intval) { |
| printf("Duplicate breakpoint %d.\n", i); |
| spinlock_unlock(&bkpoints_lock); |
| spinlock_unlock(&bkpoint_lock); |
| return 0; |
| } else if (breakpoints[i].address == (uintptr_t)argv->intval + |
| sizeof(unative_t) || breakpoints[i].address == |
| 169,10 → 169,10 |
| (uintptr_t)argv->intval - sizeof(unative_t)) { |
| printf("Adjacent breakpoints not supported, conflict " |
| "with %d.\n", i); |
| spinlock_unlock(&bkpoints_lock); |
| spinlock_unlock(&bkpoint_lock); |
| return 0; |
| } |
| } |
| for (i = 0; i < BKPOINTS_MAX; i++) |
| /branches/dynload/kernel/arch/mips32/src/mm/tlb.c |
|---|
| 26,7 → 26,7 |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup mips32mm |
| /** @addtogroup mips32mm |
| * @{ |
| */ |
| /** @file |
| 41,7 → 41,7 |
| #include <panic.h> |
| #include <arch.h> |
| #include <symtab.h> |
| #include <synch/spinlock.h> |
| #include <synch/mutex.h> |
| #include <print.h> |
| #include <debug.h> |
| #include <align.h> |
| 92,15 → 92,15 |
| uintptr_t badvaddr; |
| pte_t *pte; |
| int pfrc; |
| badvaddr = cp0_badvaddr_read(); |
| spinlock_lock(&AS->lock); |
| mutex_lock(&AS->lock); |
| asid = AS->asid; |
| spinlock_unlock(&AS->lock); |
| mutex_unlock(&AS->lock); |
| page_table_lock(AS, true); |
| pte = find_mapping_and_check(badvaddr, PF_ACCESS_READ, istate, &pfrc); |
| if (!pte) { |
| switch (pfrc) { |
| /branches/dynload/kernel/arch/mips32/src/mm/frame.c |
|---|
| 65,7 → 65,9 |
| static count_t phys_regions_count = 0; |
| static phys_region_t phys_regions[MAX_REGIONS]; |
| uintptr_t end_frame = 0; |
| /** Check whether frame is available |
| * |
| * Returns true if given frame is generally available for use. |
| 75,7 → 77,7 |
| */ |
| static bool frame_available(pfn_t frame) |
| { |
| #ifdef msim |
| #ifdef MACHINE_msim |
| /* MSIM device (dprinter) */ |
| if (frame == (KA2PA(MSIM_VIDEORAM) >> ZERO_PAGE_WIDTH)) |
| return false; |
| 85,13 → 87,13 |
| return false; |
| #endif |
| #ifdef simics |
| #ifdef MACHINE_simics |
| /* Simics device (serial line) */ |
| if (frame == (KA2PA(SERIAL_ADDRESS) >> ZERO_PAGE_WIDTH)) |
| return false; |
| #endif |
| #if defined(lgxemul) || defined(bgxemul) |
| #if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul) |
| /* gxemul devices */ |
| if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE, |
| 0x10000000, MB2SIZE(256))) |
| 236,8 → 238,10 |
| } |
| } |
| frame_add_region(start_frame, frame); |
| end_frame = frame; |
| frame_add_region(start_frame, end_frame); |
| /* Blacklist interrupt vector frame */ |
| frame_mark_unavailable(0, 1); |
| /branches/dynload/kernel/arch/mips32/src/mm/page.c |
|---|
| 26,7 → 26,7 |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup mips32mm |
| /** @addtogroup mips32mm |
| * @{ |
| */ |
| /** @file |
| 35,6 → 35,7 |
| #include <arch/mm/page.h> |
| #include <genarch/mm/page_pt.h> |
| #include <mm/page.h> |
| #include <mm/frame.h> |
| void page_arch_init(void) |
| { |
| 50,5 → 51,11 |
| return physaddr + 0xa0000000; |
| } |
| void hw_area(uintptr_t *physaddr, pfn_t *frames) |
| { |
| *physaddr = end_frame; |
| *frames = ADDR2PFN(0xffffffff - end_frame); |
| } |
| /** @} |
| */ |
| /branches/dynload/kernel/arch/mips32/src/interrupt.c |
|---|
| 41,8 → 41,9 |
| #include <ipc/sysipc.h> |
| #include <ddi/device.h> |
| #define IRQ_COUNT 8 |
| #define TIMER_IRQ 7 |
| #define IRQ_COUNT 8 |
| #define TIMER_IRQ 7 |
| #define DORDER_IRQ 5 |
| function virtual_timer_fnc = NULL; |
| static irq_t timer_irq; |
| 100,12 → 101,12 |
| cp0_compare_write(nextcount); |
| } |
| static irq_ownership_t timer_claim(void) |
| static irq_ownership_t timer_claim(void *instance) |
| { |
| return IRQ_ACCEPT; |
| } |
| static void timer_irq_handler(irq_t *irq, void *arg, ...) |
| static void timer_irq_handler(irq_t *irq) |
| { |
| unsigned long drift; |
| /branches/dynload/kernel/arch/mips32/src/drivers/serial.c |
|---|
| 112,7 → 112,7 |
| } |
| /** Process keyboard interrupt. Does not work in simics? */ |
| static void serial_irq_handler(irq_t *irq, void *arg, ...) |
| static void serial_irq_handler(irq_t *irq) |
| { |
| if ((irq->notif_cfg.notify) && (irq->notif_cfg.answerbox)) |
| ipc_irq_send_notif(irq); |
| 120,7 → 120,7 |
| serial_handler(); |
| } |
| static irq_ownership_t serial_claim(void) |
| static irq_ownership_t serial_claim(void *instance) |
| { |
| return IRQ_ACCEPT; |
| } |
| /branches/dynload/kernel/arch/mips32/src/drivers/msim.c |
|---|
| 41,7 → 41,6 |
| #include <sysinfo/sysinfo.h> |
| #include <ddi/ddi.h> |
| static parea_t msim_parea; |
| static chardev_t console; |
| static irq_t msim_irq; |
| 94,7 → 93,7 |
| } |
| /** Process keyboard interrupt. */ |
| static void msim_irq_handler(irq_t *irq, void *arg, ...) |
| static void msim_irq_handler(irq_t *irq) |
| { |
| if ((irq->notif_cfg.notify) && (irq->notif_cfg.answerbox)) |
| ipc_irq_send_notif(irq); |
| 110,7 → 109,7 |
| } |
| } |
| static irq_ownership_t msim_claim(void) |
| static irq_ownership_t msim_claim(void *instance) |
| { |
| return IRQ_ACCEPT; |
| } |
| 156,12 → 155,6 |
| sysinfo_set_item_val("kbd.inr", NULL, MSIM_KBD_IRQ); |
| sysinfo_set_item_val("kbd.address.virtual", NULL, MSIM_KBD_ADDRESS); |
| msim_parea.pbase = KA2PA(MSIM_VIDEORAM); |
| msim_parea.vbase = MSIM_VIDEORAM; |
| msim_parea.frames = 1; |
| msim_parea.cacheable = false; |
| ddi_parea_register(&msim_parea); |
| sysinfo_set_item_val("fb", NULL, true); |
| sysinfo_set_item_val("fb.kind", NULL, 3); |
| sysinfo_set_item_val("fb.address.physical", NULL, KA2PA(MSIM_VIDEORAM)); |