Index: HelenOS.config =================================================================== --- HelenOS.config (revision eca52a800f89d716e768d8312dbea7309e514476) +++ HelenOS.config (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -37,4 +37,5 @@ @ "ia64" Intel IA-64 @ "mips32" MIPS 32-bit +@ "mips64" MIPS 64-bit @ "ppc32" PowerPC 32-bit (iMac G4) @ "sparc64" Sun UltraSPARC 64-bit @@ -48,4 +49,8 @@ % Machine type +@ "msim" MSIM +! [PLATFORM=mips64] MACHINE (choice) + +% Machine type @ "i460GX" i460GX chipset machine @ "ski" Ski ia64 simulator @@ -54,5 +59,4 @@ % Machine type @ "generic" Generic Sun workstation or server -@ "serengeti" Serengeti system ! [PLATFORM=sparc64] MACHINE (choice) @@ -81,8 +85,4 @@ ! [PLATFORM=sparc64&MACHINE=generic] PROCESSOR (choice) -% CPU type -@ "us3" -! [PLATFORM=sparc64&MACHINE=serengeti] PROCESSOR (choice) - % RAM disk format @ "tmpfs" TMPFS image @@ -122,4 +122,8 @@ % Kernel architecture +@ "mips64" +! [PLATFORM=mips64] KARCH (choice) + +% Kernel architecture @ "ppc32" ! [PLATFORM=ppc32] KARCH (choice) @@ -165,4 +169,8 @@ % User space architecture +@ "mips64" +! [PLATFORM=mips64] UARCH (choice) + +% User space architecture @ "ppc32" ! [PLATFORM=ppc32] UARCH (choice) @@ -206,4 +214,8 @@ @ "mips32" ! [PLATFORM=mips32] BARCH (choice) + +% Boot architecture +@ "mips64" +! [PLATFORM=mips64] BARCH (choice) % Boot architecture @@ -229,4 +241,8 @@ @ "ecoff" ! [PLATFORM=mips32&(MACHINE=bgxemul|MACHINE=lgxemul)] IMAGE (choice) + +% Image format +@ "binary" +! [PLATFORM=mips64] IMAGE (choice) @@ -256,5 +272,5 @@ @ "gcc_cross" GNU C Compiler (cross-compiler) @ "gcc_native" GNU C Compiler (native) -! [PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] COMPILER (choice) +! [PLATFORM=arm32|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32] COMPILER (choice) % Compiler @@ -292,14 +308,14 @@ % Page hash table support -! [PLATFORM=ia64|PLATFORM=sparc64] CONFIG_PAGE_HT (y) +! [PLATFORM=ia64|PLATFORM=mips64|PLATFORM=sparc64] CONFIG_PAGE_HT (y) % Software integer division support -! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_SOFTINT (y) +! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32] CONFIG_SOFTINT (y) % ASID support -! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID (y) +! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID (y) % ASID FIFO support -! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID_FIFO (y) +! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID_FIFO (y) % OpenFirmware tree support @@ -322,5 +338,5 @@ % Support for SMP -! [(PLATFORM=ia32&PROCESSOR!=athlon_xp)|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64|(PLATFORM=mips32&MACHINE=msim)|PLATFORM=abs32le] CONFIG_SMP (y/n) +! [(PLATFORM=ia32&PROCESSOR!=athlon_xp)|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64|(PLATFORM=mips32&MACHINE=msim)|(PLATFORM=mips64&MACHINE=msim)|PLATFORM=abs32le] CONFIG_SMP (y/n) % Debug build @@ -379,5 +395,5 @@ @ "generic" Keyboard or serial line @ "none" No input device -! [PLATFORM=ia32|(PLATFORM=arm32&MACHINE=testarm)|PLATFORM=amd64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_HID_IN (choice) +! [PLATFORM=ia32|(PLATFORM=arm32&MACHINE=testarm)|PLATFORM=amd64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_HID_IN (choice) % Input device class @@ -395,5 +411,5 @@ @ "generic" Monitor or serial line @ "none" No output device -! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ppc32|(PLATFORM=ia64&MACHINE=i460GX)|(PLATFORM=mips32&MACHINE=msim)] CONFIG_HID_OUT (choice) +! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ppc32|(PLATFORM=ia64&MACHINE=i460GX)|(PLATFORM=mips32&MACHINE=msim)|(PLATFORM=mips64&MACHINE=msim)] CONFIG_HID_OUT (choice) % Output device class @@ -421,8 +437,8 @@ % Support for msim/GXemul keyboard -! [CONFIG_HID_IN=generic&PLATFORM=mips32] CONFIG_MIPS_KBD (y/n) +! [CONFIG_HID_IN=generic&(PLATFORM=mips32|PLATFORM=mips64)] CONFIG_MIPS_KBD (y/n) % Support for msim/GXemul printer -! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=mips32] CONFIG_MIPS_PRN (y/n) +! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&(PLATFORM=mips32|PLATFORM=mips64)] CONFIG_MIPS_PRN (y/n) % Support for GXemul keyboard @@ -447,13 +463,4 @@ ! [PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_IRQC (y) -% Support for Z8530 controller -! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=sparc64&MACHINE=generic] CONFIG_Z8530 (y/n) - -% Support for Serengeti console -! [CONFIG_HID_OUT=generic&PLATFORM=sparc64&MACHINE=serengeti] CONFIG_SGCN_PRN (y/n) - -% Support for Serengeti keyboard -! [CONFIG_HID_IN=generic&PLATFORM=sparc64&MACHINE=serengeti] CONFIG_SGCN_KBD (y/n) - % Support for i8042 controller ! [CONFIG_PC_KBD=y] CONFIG_I8042 (y) @@ -463,5 +470,5 @@ % Sun keyboard support -! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=sparc64&MACHINE=generic&(CONFIG_NS16550=y|CONFIG_Z8530=y)] CONFIG_SUN_KBD (y) +! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=sparc64&MACHINE=generic&CONFIG_NS16550=y] CONFIG_SUN_KBD (y) % Macintosh ADB keyboard support @@ -475,5 +482,5 @@ % Serial line input module -! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&MACHINE=serengeti&CONFIG_SGCN_KBD=y)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y) +! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y) % EGA support @@ -522,7 +529,4 @@ ! [PLATFORM=sparc64&CONFIG_SMP=y] CONFIG_AP (y/n) -% Preserve A.OUT header in isofs.b -! [PLATFORM=sparc64&MACHINE=generic] CONFIG_AOUT_ISOFS_B (y) - % Dynamic linking support ! [PLATFORM=ia32] CONFIG_RTLD (n/y) Index: boot/Makefile =================================================================== --- boot/Makefile (revision eca52a800f89d716e768d8312dbea7309e514476) +++ boot/Makefile (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -76,5 +76,5 @@ cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.dev" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \ done - + clean: clean_dist $(MAKE) -f $(BUILD) clean PRECHECK=$(PRECHECK) Index: boot/Makefile.silo =================================================================== --- boot/Makefile.silo (revision eca52a800f89d716e768d8312dbea7309e514476) +++ boot/Makefile.silo (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -31,9 +31,5 @@ include Makefile.common -ifeq ($(CONFIG_AOUT_ISOFS_B),y) - SILO_PACKAGE = a.out -else - SILO_PACKAGE = raw -endif +SILO_PACKAGE = a.out ISOFS_B = silo/$(SILO_PACKAGE)/isofs.b Index: boot/Makefile.uboot =================================================================== --- boot/Makefile.uboot (revision eca52a800f89d716e768d8312dbea7309e514476) +++ boot/Makefile.uboot (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -31,6 +31,6 @@ include Makefile.common -IMAGE_NAME=HelenOS-$(RELEASE) -BIN_OUTPUT=image.bin +IMAGE_NAME = HelenOS-$(RELEASE) +BIN_OUTPUT = image.bin all: $(POST_OUTPUT) @@ -40,6 +40,5 @@ $(POST_OUTPUT): $(BIN_OUTPUT) - $(MKUIMAGE) -name "$(IMAGE_NAME)" -laddr 0x30008000 -saddr 0x30008000 \ - $< $@ + $(MKUIMAGE) -name "$(IMAGE_NAME)" -laddr 0x30008000 -saddr 0x30008000 $< $@ clean: Index: boot/arch/ia64/include/types.h =================================================================== --- boot/arch/ia64/include/types.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ boot/arch/ia64/include/types.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -30,7 +30,9 @@ #define BOOT_ia64_TYPES_H_ +#include + #define TASKMAP_MAX_RECORDS 32 #define BOOTINFO_TASK_NAME_BUFLEN 32 -#define MEMMAP_ITEMS 128 +#define MEMMAP_ITEMS 128 typedef uint64_t size_t; @@ -53,10 +55,10 @@ unsigned long base; unsigned long size; -} efi_memmap_item_t; +} memmap_item_t; typedef struct { binit_t taskmap; - efi_memmap_item_t memmap[MEMMAP_ITEMS]; + memmap_item_t memmap[MEMMAP_ITEMS]; unsigned int memmap_items; @@ -65,6 +67,14 @@ unsigned long freq_scale; unsigned int wakeup_intno; - int hello_configured; } bootinfo_t; +/** This is a minimal ELILO-compatible boot parameter structure. */ +typedef struct { + uint64_t cmd_line; + uint64_t efi_system_table; + uint64_t efi_memmap; + uint64_t efi_memmap_sz; + uint64_t efi_memdesc_sz; +} boot_param_t; + #endif Index: boot/arch/ia64/src/boot.S =================================================================== --- boot/arch/ia64/src/boot.S (revision eca52a800f89d716e768d8312dbea7309e514476) +++ boot/arch/ia64/src/boot.S (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -37,4 +37,11 @@ # + # Save the boot parameter structure address passed from the + # ELILO-compatible EFI loader. + # + movl r8 = bootpar ;; + st8 [r8] = r28 + + # # Initialize the register stack to some sane value. # @@ -62,4 +69,8 @@ .bss +.global bootpar +bootpar: + .quad 0 + .align STACK_SIZE initial_stack: Index: boot/arch/ia64/src/main.c =================================================================== --- boot/arch/ia64/src/main.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ boot/arch/ia64/src/main.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -30,7 +30,9 @@ #include +#include #include #include #include +#include #include #include @@ -51,9 +53,80 @@ #define DEFAULT_SYS_FREQ 100000000ULL /* 100MHz */ -#define EFI_MEMMAP_FREE_MEM 0 -#define EFI_MEMMAP_IO 1 -#define EFI_MEMMAP_IO_PORTS 2 +#define MEMMAP_FREE_MEM 0 +#define MEMMAP_IO 1 +#define MEMMAP_IO_PORTS 2 + +extern boot_param_t *bootpar; static bootinfo_t bootinfo; + +static void read_efi_memmap(void) +{ + memmap_item_t *memmap = bootinfo.memmap; + size_t items = 0; + + if (!bootpar) { + /* Fake-up a memory map for simulators. */ + memmap[items].base = DEFAULT_MEMORY_BASE; + memmap[items].size = DEFAULT_MEMORY_SIZE; + memmap[items].type = MEMMAP_FREE_MEM; + items++; + + memmap[items].base = DEFAULT_LEGACY_IO_BASE; + memmap[items].size = DEFAULT_LEGACY_IO_SIZE; + memmap[items].type = MEMMAP_IO_PORTS; + items++; + } else { + char *cur, *mm_base = (char *) bootpar->efi_memmap; + size_t mm_size = bootpar->efi_memmap_sz; + size_t md_size = bootpar->efi_memdesc_sz; + + /* + * Walk the EFI memory map using the V1 memory descriptor + * format. The actual memory descriptor can use newer format, + * but it must always be backwards compatible with the V1 + * format. + */ + for (cur = mm_base; + (cur < mm_base + (mm_size - md_size)) && + (items < MEMMAP_ITEMS); + cur += md_size) { + efi_v1_memdesc_t *md = (efi_v1_memdesc_t *) cur; + + switch ((efi_memory_type_t) md->type) { + case EFI_CONVENTIONAL_MEMORY: + memmap[items].type = MEMMAP_FREE_MEM; + break; + case EFI_MEMORY_MAPPED_IO: + memmap[items].type = MEMMAP_IO; + break; + case EFI_MEMORY_MAPPED_IO_PORT_SPACE: + memmap[items].type = MEMMAP_IO_PORTS; + break; + default: + continue; + } + + memmap[items].base = md->phys_start; + memmap[items].size = md->pages * EFI_PAGE_SIZE; + items++; + } + } + + bootinfo.memmap_items = items; +} + +static void read_sal_configuration(void) +{ + if (!bootpar) { + /* Configure default values for simulators. */ + bootinfo.freq_scale = DEFAULT_FREQ_SCALE; + bootinfo.sys_freq = DEFAULT_SYS_FREQ; + } else { + /* TODO: read the real values from SAL */ + bootinfo.freq_scale = DEFAULT_FREQ_SCALE; + bootinfo.sys_freq = DEFAULT_SYS_FREQ; + } +} void bootstrap(void) @@ -113,31 +186,7 @@ printf(".\n"); - - if (!bootinfo.hello_configured) { /* XXX */ - /* - * Load configuration defaults for simulators. - */ - bootinfo.memmap_items = 0; - - bootinfo.memmap[bootinfo.memmap_items].base = - DEFAULT_MEMORY_BASE; - bootinfo.memmap[bootinfo.memmap_items].size = - DEFAULT_MEMORY_SIZE; - bootinfo.memmap[bootinfo.memmap_items].type = - EFI_MEMMAP_FREE_MEM; - bootinfo.memmap_items++; - bootinfo.memmap[bootinfo.memmap_items].base = - DEFAULT_LEGACY_IO_BASE; - bootinfo.memmap[bootinfo.memmap_items].size = - DEFAULT_LEGACY_IO_SIZE; - bootinfo.memmap[bootinfo.memmap_items].type = - EFI_MEMMAP_IO_PORTS; - bootinfo.memmap_items++; - - bootinfo.freq_scale = DEFAULT_FREQ_SCALE; - bootinfo.sys_freq = DEFAULT_SYS_FREQ; - } - + read_efi_memmap(); + read_sal_configuration(); printf("Booting the kernel ...\n"); Index: boot/arch/mips32/Makefile.inc =================================================================== --- boot/arch/mips32/Makefile.inc (revision eca52a800f89d716e768d8312dbea7309e514476) +++ boot/arch/mips32/Makefile.inc (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -30,7 +30,5 @@ BITS = 32 PAGE_SIZE = 16384 -EXTRA_CFLAGS = -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 - -RD_SRVS_ESSENTIAL += +EXTRA_CFLAGS = -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32 RD_SRVS_NON_ESSENTIAL += \ Index: boot/arch/mips64/Makefile.inc =================================================================== --- boot/arch/mips64/Makefile.inc (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ boot/arch/mips64/Makefile.inc (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,54 @@ +# +# Copyright (c) 2006 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. +# + +BFD_ARCH = mips:4000 +BITS = 64 +PAGE_SIZE = 16384 +EXTRA_CFLAGS = -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=64 + +ifeq ($(MACHINE),msim) + BFD_NAME = elf64-tradlittlemips + BFD_OUTPUT = binary + ENDIANESS = LE + EXTRA_GCC_CFLAGS = -mhard-float +endif + +SOURCES = \ + arch/$(BARCH)/src/asm.S \ + arch/$(BARCH)/src/main.c \ + arch/$(BARCH)/src/putchar.c \ + $(COMPS_C) \ + genarch/src/division.c \ + genarch/src/multiplication.c \ + generic/src/memstr.c \ + generic/src/printf_core.c \ + generic/src/vprintf.c \ + generic/src/printf.c \ + generic/src/str.c \ + generic/src/version.c \ + generic/src/inflate.c Index: boot/arch/mips64/_link.ld.in =================================================================== --- boot/arch/mips64/_link.ld.in (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ boot/arch/mips64/_link.ld.in (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,30 @@ +OUTPUT_FORMAT(elf64-tradlittlemips) +ENTRY(start) + +SECTIONS { + . = 0xffffffffbfc00000; + .text : { + *(BOOTSTRAP); + *(.text); + } + .data : { + *(.data); /* initialized data */ + *(.rodata); + *(.rodata.*); + *(.sdata); + *(.reginfo); + *(.sbss); + *(.scommon); + *(.bss); /* uninitialized static variables */ + *(COMMON); /* global variables */ +[[COMPONENTS]] + } + + /DISCARD/ : { + *(.gnu.*); + *(.mdebug*); + *(.pdr); + *(.comment); + *(.note); + } +} Index: boot/arch/mips64/include/arch.h =================================================================== --- boot/arch/mips64/include/arch.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ boot/arch/mips64/include/arch.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2006 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. + */ + +#ifndef BOOT_mips64_ARCH_H_ +#define BOOT_mips64_ARCH_H_ + +#define PAGE_WIDTH 14 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#define CPUMAP_OFFSET 0x00001000 +#define STACK_OFFSET 0x00002000 +#define BOOTINFO_OFFSET 0x00003000 +#define BOOT_OFFSET 0x00100000 +#define LOADER_OFFSET 0x1fc00000 + +#define MSIM_VIDEORAM_ADDRESS 0xffffffffb0000000 +#define MSIM_DORDER_ADDRESS 0xffffffffb0000100 + +#ifndef __ASM__ + #define PA2KA(addr) (((uintptr_t) (addr)) + 0xffffffff80000000) + #define KSEG2PA(addr) (((uintptr_t) (addr)) - 0xffffffffa0000000) +#else + #define PA2KA(addr) ((addr) + 0xffffffff80000000) + #define KSEG2PA(addr) ((addr) - 0xffffffffa0000000) +#endif + +#endif Index: boot/arch/mips64/include/asm.h =================================================================== --- boot/arch/mips64/include/asm.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ boot/arch/mips64/include/asm.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,1 @@ +../../mips32/include/asm.h Index: boot/arch/mips64/include/main.h =================================================================== --- boot/arch/mips64/include/main.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ boot/arch/mips64/include/main.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,1 @@ +../../mips32/include/main.h Index: boot/arch/mips64/include/regname.h =================================================================== --- boot/arch/mips64/include/regname.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ boot/arch/mips64/include/regname.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,1 @@ +../../mips32/include/regname.h Index: boot/arch/mips64/include/types.h =================================================================== --- boot/arch/mips64/include/types.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ boot/arch/mips64/include/types.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2006 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. + */ + +#ifndef BOOT_mips64_TYPES_H_ +#define BOOT_mips64_TYPES_H_ + +#define TASKMAP_MAX_RECORDS 32 +#define CPUMAP_MAX_RECORDS 32 +#define BOOTINFO_TASK_NAME_BUFLEN 32 + +typedef uint64_t size_t; +typedef uint64_t uintptr_t; + +typedef struct { + /** Address where the task was placed. */ + void *addr; + /** Size of the task's binary. */ + size_t size; + /** Task name. */ + char name[BOOTINFO_TASK_NAME_BUFLEN]; +} task_t; + +typedef struct { + uint32_t cpumap; + size_t cnt; + task_t tasks[TASKMAP_MAX_RECORDS]; +} bootinfo_t; + +#endif Index: boot/arch/mips64/src/asm.S =================================================================== --- boot/arch/mips64/src/asm.S (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ boot/arch/mips64/src/asm.S (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,150 @@ +# +# Copyright (c) 2006 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. +# + +#include +#include + +.set noat +.set noreorder +.set nomacro + +.global start +.global halt +.global jump_to_kernel + +.section BOOTSTRAP + +start: + /* + * Setup the CP0 configuration + * - Enable 64-bit kernel addressing mode + * - Enable 64-bit supervisor adressing mode + * - Enable 64-bit user addressing mode + */ + dmfc0 $a0, $status + ori $a0, 0x00e0 + dmtc0 $a0, $status + + /* + * Setup CPU map (on msim this code + * is executed in parallel on all CPUs, + * but it not an issue). + */ + dla $a0, PA2KA(CPUMAP_OFFSET) + + sw $zero, 0($a0) + sw $zero, 4($a0) + sw $zero, 8($a0) + sw $zero, 12($a0) + + sw $zero, 16($a0) + sw $zero, 20($a0) + sw $zero, 24($a0) + sw $zero, 28($a0) + + sw $zero, 32($a0) + sw $zero, 36($a0) + sw $zero, 40($a0) + sw $zero, 44($a0) + + sw $zero, 48($a0) + sw $zero, 52($a0) + sw $zero, 56($a0) + sw $zero, 60($a0) + + sw $zero, 64($a0) + sw $zero, 68($a0) + sw $zero, 72($a0) + sw $zero, 76($a0) + + sw $zero, 80($a0) + sw $zero, 84($a0) + sw $zero, 88($a0) + sw $zero, 92($a0) + + sw $zero, 96($a0) + sw $zero, 100($a0) + sw $zero, 104($a0) + sw $zero, 108($a0) + + sw $zero, 112($a0) + sw $zero, 116($a0) + sw $zero, 120($a0) + sw $zero, 124($a0) + + lui $a1, 1 + +#ifdef MACHINE_msim + + /* Read dorder value */ + dla $k0, MSIM_DORDER_ADDRESS + lw $k1, ($k0) + + /* + * If we are not running on BSP + * then end in an infinite loop. + */ + beq $k1, $zero, bsp + nop + + /* Record CPU presence */ + sll $a2, $k1, 2 + addu $a2, $a2, $a0 + sw $a1, ($a2) + + loop: + j loop + nop + +#endif + + bsp: + /* Record CPU presence */ + sw $a1, ($a0) + + /* Setup initial stack */ + dla $sp, PA2KA(STACK_OFFSET) + + j bootstrap + nop + +.text + +halt: + j halt + nop + +jump_to_kernel: + /* + * TODO: + * + * Make sure that the I-cache, D-cache and memory are mutually + * coherent before passing control to the copied code. + */ + j $a0 + nop Index: boot/arch/mips64/src/main.c =================================================================== --- boot/arch/mips64/src/main.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ boot/arch/mips64/src/main.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2005 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. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define TOP2ADDR(top) (((void *) PA2KA(BOOT_OFFSET)) + (top)) + +static bootinfo_t *bootinfo = (bootinfo_t *) PA2KA(BOOTINFO_OFFSET); +static uint32_t *cpumap = (uint32_t *) PA2KA(CPUMAP_OFFSET); + +void bootstrap(void) +{ + version_print(); + + printf("\nMemory statistics\n"); + printf(" %p|%p: CPU map\n", (void *) PA2KA(CPUMAP_OFFSET), + (void *) CPUMAP_OFFSET); + printf(" %p|%p: bootstrap stack\n", (void *) PA2KA(STACK_OFFSET), + (void *) STACK_OFFSET); + printf(" %p|%p: boot info structure\n", + (void *) PA2KA(BOOTINFO_OFFSET), (void *) BOOTINFO_OFFSET); + printf(" %p|%p: kernel entry point\n", (void *) PA2KA(BOOT_OFFSET), + (void *) BOOT_OFFSET); + printf(" %p|%p: bootloader entry point\n", + (void *) PA2KA(LOADER_OFFSET), (void *) LOADER_OFFSET); + + size_t i; + for (i = 0; i < COMPONENTS; i++) + printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].start, + (void *) KSEG2PA(components[i].start), components[i].name, + components[i].inflated, components[i].size); + + void *dest[COMPONENTS]; + size_t top = 0; + size_t cnt = 0; + bootinfo->cnt = 0; + for (i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) { + top = ALIGN_UP(top, PAGE_SIZE); + + if (i > 0) { + bootinfo->tasks[bootinfo->cnt].addr = TOP2ADDR(top); + bootinfo->tasks[bootinfo->cnt].size = components[i].inflated; + + str_cpy(bootinfo->tasks[bootinfo->cnt].name, + BOOTINFO_TASK_NAME_BUFLEN, components[i].name); + + bootinfo->cnt++; + } + + dest[i] = TOP2ADDR(top); + top += components[i].inflated; + cnt++; + } + + printf("\nInflating components ... "); + + for (i = cnt; i > 0; i--) { + void *tail = dest[i - 1] + components[i].inflated; + if (tail >= ((void *) PA2KA(LOADER_OFFSET))) { + printf("\n%s: Image too large to fit (%p >= %p), halting.\n", + components[i].name, tail, (void *) PA2KA(LOADER_OFFSET)); + halt(); + } + + printf("%s ", components[i - 1].name); + + int err = inflate(components[i - 1].start, components[i - 1].size, + dest[i - 1], components[i - 1].inflated); + + if (err != EOK) { + printf("\n%s: Inflating error %d, halting.\n", + components[i - 1].name, err); + halt(); + } + } + + printf(".\n"); + + printf("Copying CPU map ... \n"); + + bootinfo->cpumap = 0; + for (i = 0; i < CPUMAP_MAX_RECORDS; i++) { + if (cpumap[i] != 0) + bootinfo->cpumap |= (1 << i); + } + + printf("Booting the kernel ... \n"); + jump_to_kernel((void *) PA2KA(BOOT_OFFSET), bootinfo); +} Index: boot/arch/mips64/src/putchar.c =================================================================== --- boot/arch/mips64/src/putchar.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ boot/arch/mips64/src/putchar.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2006 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. + */ + +#include +#include +#include +#include + +void putchar(const wchar_t ch) +{ + if (ascii_check(ch)) + *((char *) MSIM_VIDEORAM_ADDRESS) = ch; + else + *((char *) MSIM_VIDEORAM_ADDRESS) = U_SPECIAL; +} Index: boot/arch/sparc64/Makefile.inc =================================================================== --- boot/arch/sparc64/Makefile.inc (revision eca52a800f89d716e768d8312dbea7309e514476) +++ boot/arch/sparc64/Makefile.inc (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -43,5 +43,4 @@ RD_SRVS_ESSENTIAL += \ - $(USPACE_PATH)/srv/hw/irc/fhc/fhc \ $(USPACE_PATH)/srv/hw/irc/obio/obio Index: boot/arch/sparc64/src/main.c =================================================================== --- boot/arch/sparc64/src/main.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ boot/arch/sparc64/src/main.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -182,8 +182,5 @@ * of the "/memory" node to find out which parts of memory * are used by OBP and redesign the algorithm of copying - * kernel/init tasks/ramdisk from the bootable image to memory - * (which we must do anyway because of issues with claiming the memory - * on Serengeti). - * + * kernel/init tasks/ramdisk from the bootable image to memory. */ bootinfo.physmem_start += OBP_BIAS; Index: boot/genarch/include/efi.h =================================================================== --- boot/genarch/include/efi.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ boot/genarch/include/efi.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2011 Jakub Jermar + * 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. + */ + +#ifndef BOOT_EFI_H_ +#define BOOT_EFI_H_ + +typedef enum { + EFI_RESERVED, + EFI_LOADER_CODE, + EFI_LOADER_DATA, + EFI_BOOT_SERVICES_CODE, + EFI_BOOT_SERVICES_DATA, + EFI_RUNTIME_SERVICES_CODE, + EFI_RUNTIME_SERVICES_DATA, + EFI_CONVENTIONAL_MEMORY, + EFI_UNUSABLE_MEMORY, + EFI_ACPI_RECLAIM_MEMORY, + EFI_ACPI_MEMORY_NVS, + EFI_MEMORY_MAPPED_IO, + EFI_MEMORY_MAPPED_IO_PORT_SPACE, + EFI_PAL_CODE +} efi_memory_type_t; + +typedef struct { + uint32_t type; + uint64_t phys_start; + uint64_t virt_start; + uint64_t pages; + uint64_t attribute; +} efi_v1_memdesc_t; + +#define EFI_PAGE_SIZE 4096 + +#endif Index: ntrib/tools/serengeti_silo.sh =================================================================== --- contrib/tools/serengeti_silo.sh (revision eca52a800f89d716e768d8312dbea7309e514476) +++ (revision ) @@ -1,74 +1,0 @@ -#!/bin/bash - -# Download SILO and patch it so that it can be used to create a bootable CD -# for the Serengeti machine -# by Pavel Rimsky -# portions by Martin Decky -# -# GPL'ed, copyleft -# - -# stuff to be downloaded -SILO_DOWNLOAD_FILE='silo-loaders-1.4.11.tar.gz' -SILO_DOWNLOAD_URL='http://silo.auxio.org/pub/silo/old/'$SILO_DOWNLOAD_FILE - -# check whether the last command failed, if so, write an error message and exit -check_error() { - if [ "$1" -ne "0" ]; then - echo - echo "Script failed: $2" - exit - fi -} - -# temporary files are to be stored in /tmp -# the resulting file in the current directory -WD=`pwd` -cd /tmp - -# download SILO from its official website -echo ">>> Downloading SILO" -wget $SILO_DOWNLOAD_URL -check_error $? "Error downloading SILO." - -# unpack the downloaded file -echo ">>> Unpacking tarball" -tar xvzf $SILO_DOWNLOAD_FILE -check_error $? "Error unpacking tarball." - -# CD to the unpacked directory -echo ">>> Changing to the unpacked SILO directory" -cd boot -check_error $? "Changing directory failed." - -# patch it - remove bytes 512 to 512 + 32 (counted from 0), which belong to -# the ELF header which is not recognized by the Serengeti firmware -echo ">>> Patching SILO" -(((xxd -p -l 512 isofs.b) && (xxd -p -s 544 isofs.b)) | xxd -r -p) \ - > isofs.b.patched -check_error $? "Patching SILO failed" -mv isofs.b.patched isofs.b - -# get rid of files which are not needed for creating the bootable CD -echo ">>> Purging SILO directory" -for file in `ls`; do - if [ \( -f $file \) -a \( $file != "isofs.b" \) -a \( $file != "second.b" \) ]; - then - rm -fr $file; - fi -done -check_error $? "Purging SILO directory failed" - -# create the gzipped tarball with patched SILO -echo ">>> Creating tarball with patched SILO" -tar cvzf silo.patched.tar.gz *.b -check_error $? "Creating tarball with patched SILO failed" - -# and move it to the directory where the user expects it to be -echo ">>> Moving the tarball with patched SILO to the current directory" -mv silo.patched.tar.gz $WD -check_error $? "Moving the tarball with patched SILO failed" - -# move back to the working directory from /tmp -cd $WD - Index: defaults/mips64/Makefile.config =================================================================== --- defaults/mips64/Makefile.config (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ defaults/mips64/Makefile.config (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,48 @@ +# Platform +PLATFORM = mips64 + +# Ramdisk format +RDFMT = fat + +# Compiler +COMPILER = gcc_cross + +# Debug build +CONFIG_DEBUG = y + +# Deadlock detection support for spinlocks +CONFIG_DEBUG_SPINLOCK = y + +# Support for SMP +CONFIG_SMP = y + +# Support for userspace debuggers +CONFIG_UDEBUG = y + +# Kernel console support +CONFIG_KCONSOLE = y + +# Kernel symbol information +CONFIG_SYMTAB = y + +# Detailed kernel logging +CONFIG_LOG = n + +# Kernel function tracing +CONFIG_TRACE = n + +# Compile kernel tests +CONFIG_TEST = y + +# Input device class +CONFIG_HID_IN = generic + +# Output device class +CONFIG_HID_OUT = generic + +# Load disk drivers on startup +CONFIG_START_BD = n + +# Mount /data on startup +CONFIG_MOUNT_DATA = n + Index: defaults/mips64/msim/Makefile.config =================================================================== --- defaults/mips64/msim/Makefile.config (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ defaults/mips64/msim/Makefile.config (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,2 @@ +# Machine type +MACHINE = msim Index: defaults/mips64/output =================================================================== --- defaults/mips64/output (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ defaults/mips64/output (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,1 @@ +image.boot Index: defaults/sparc64/Makefile.config =================================================================== --- defaults/sparc64/Makefile.config (revision eca52a800f89d716e768d8312dbea7309e514476) +++ defaults/sparc64/Makefile.config (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -53,7 +53,4 @@ CONFIG_AP = y -# Preserve A.OUT header in isofs.b -CONFIG_AOUT_ISOFS_B = y - # Load disk drivers on startup CONFIG_START_BD = n Index: faults/sparc64/serengeti/Makefile.config =================================================================== --- defaults/sparc64/serengeti/Makefile.config (revision eca52a800f89d716e768d8312dbea7309e514476) +++ (revision ) @@ -1,11 +1,0 @@ -# Machine type -MACHINE = serengeti -RDFMT = tmpfs -CONFIG_SMP = n -CONFIG_DEBUG = n -CONFIG_UDEBUG = n -CONFIG_SYMTAB = n -CONFIG_TEST = n -CONFIG_STRIP_BINARIES = y -CONFIG_OPTIMIZE_FOR_SIZE = y -CONFIG_BAREBONE = y Index: kernel/arch/amd64/Makefile.inc =================================================================== --- kernel/arch/amd64/Makefile.inc (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/amd64/Makefile.inc (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -41,5 +41,5 @@ # is fixed. # -# If GCC generates a code for tail call, instead of generating .. +# When GCC generates a code for tail call, instead of generating .. # # jmp *fnc @@ -48,4 +48,6 @@ # # jmp *$fnc +# +# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48385 for reference. # Index: kernel/arch/arm32/src/mach/gta02/gta02.c =================================================================== --- kernel/arch/arm32/src/mach/gta02/gta02.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/arm32/src/mach/gta02/gta02.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -158,6 +158,4 @@ { #ifdef CONFIG_FB - parea_t fb_parea; - fb_properties_t prop = { .addr = GTA02_FB_BASE, @@ -170,18 +168,11 @@ outdev_t *fb_dev = fb_init(&prop); - if (fb_dev) { + if (fb_dev) stdout_wire(fb_dev); - fb_parea.pbase = GTA02_FB_BASE; - fb_parea.frames = 150; - fb_parea.unpriv = false; - ddi_parea_register(&fb_parea); - } #endif /* Initialize serial port of the debugging console. */ - s3c24xx_uart_io_t *scons_io; - - scons_io = (void *) hw_map(GTA02_SCONS_BASE, PAGE_SIZE); - gta02_scons_dev = s3c24xx_uart_init(scons_io, S3C24XX_INT_UART2); + gta02_scons_dev = + s3c24xx_uart_init(GTA02_SCONS_BASE, S3C24XX_INT_UART2); if (gta02_scons_dev) { Index: kernel/arch/arm32/src/mach/integratorcp/integratorcp.c =================================================================== --- kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -53,5 +53,4 @@ #define SDRAM_SIZE (sdram[((*(uint32_t *)(ICP_CMCR+ICP_SDRAMCR_OFFSET) & ICP_SDRAM_MASK) >> 2)]) -static parea_t fb_parea; static icp_hw_map_t icp_hw_map; static irq_t icp_timer_irq; @@ -296,11 +295,6 @@ outdev_t *fbdev = fb_init(&prop); - if (fbdev) { + if (fbdev) stdout_wire(fbdev); - fb_parea.pbase = ICP_FB; - fb_parea.frames = 300; - fb_parea.unpriv = false; - ddi_parea_register(&fb_parea); - } #endif } Index: kernel/arch/ia32/src/boot/vesa_real.inc =================================================================== --- kernel/arch/ia32/src/boot/vesa_real.inc (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/ia32/src/boot/vesa_real.inc (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -154,4 +154,14 @@ mov $e_vesa_init - vesa_init, %di push %di + /* Write the "VBE2" signature into the info structure in order + * to get proper mode information. The presence of "VBE2" + * indicates two things: + * + * - VBE controller information structure is expected to be + * 512 bytes long instead of 256 bytes. + * - The BIOS should report VBE 3.0 information (potentially + * including non-standard modes in the mode list). + */ + movl $0x32454256, (%di) int $0x10 Index: kernel/arch/ia64/include/bootinfo.h =================================================================== --- kernel/arch/ia64/include/bootinfo.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/ia64/include/bootinfo.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -34,5 +34,5 @@ #define MEMMAP_ITEMS 128 -#define EFI_MEMMAP_FREE_MEM 0 +#define MEMMAP_FREE_MEM 0 /** Size of buffer for storing task name in binit_task_t. */ @@ -54,10 +54,10 @@ unsigned long base; unsigned long size; -} efi_memmap_item_t; +} memmap_item_t; typedef struct { binit_t taskmap; - efi_memmap_item_t memmap[MEMMAP_ITEMS]; + memmap_item_t memmap[MEMMAP_ITEMS]; unsigned int memmap_items; @@ -66,5 +66,4 @@ unsigned long freq_scale; unsigned int wakeup_intno; - int hello_configured; } bootinfo_t; Index: kernel/arch/ia64/src/drivers/ski.c =================================================================== --- kernel/arch/ia64/src/drivers/ski.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/ia64/src/drivers/ski.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -57,5 +57,5 @@ }; -static void ski_putchar(outdev_t *, const wchar_t, bool); +static void ski_putchar(outdev_t *, const wchar_t); static outdev_operations_t skidev_ops = { @@ -99,7 +99,4 @@ static void poll_keyboard(ski_instance_t *instance) { - if (silent) - return; - int count = POLL_LIMIT; @@ -121,5 +118,8 @@ while (true) { - if (!silent) + // TODO FIXME: + // This currently breaks the kernel console + // before we get the override from uspace. + if (console_override) poll_keyboard(instance); @@ -182,10 +182,12 @@ * @param dev Character device. * @param ch Character to be printed. - * @param silent Whether the output should be silenced. - * - */ -static void ski_putchar(outdev_t *dev, const wchar_t ch, bool silent) -{ - if (!silent) { + * + */ +static void ski_putchar(outdev_t *dev, const wchar_t ch) +{ + // TODO FIXME: + // This currently breaks the kernel console + // before we get the override from uspace. + if (console_override) { if (ascii_check(ch)) { if (ch == '\n') @@ -213,5 +215,6 @@ if (!fb_exported) { /* - * This is the necessary evil until the userspace driver is entirely + * This is the necessary evil until + * the userspace driver is entirely * self-sufficient. */ Index: kernel/arch/ia64/src/ia64.c =================================================================== --- kernel/arch/ia64/src/ia64.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/ia64/src/ia64.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -151,5 +151,5 @@ /* Set platform name. */ #ifdef MACHINE_ski - platform = "pc"; + platform = "ski"; #endif #ifdef MACHINE_i460GX Index: kernel/arch/ia64/src/mm/frame.c =================================================================== --- kernel/arch/ia64/src/mm/frame.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/ia64/src/mm/frame.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -58,5 +58,5 @@ unsigned int i; for (i = 0; i < bootinfo->memmap_items; i++) { - if (bootinfo->memmap[i].type == EFI_MEMMAP_FREE_MEM) { + if (bootinfo->memmap[i].type == MEMMAP_FREE_MEM) { uint64_t base = bootinfo->memmap[i].base; uint64_t size = bootinfo->memmap[i].size; Index: kernel/arch/mips32/Makefile.inc =================================================================== --- kernel/arch/mips32/Makefile.inc (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/mips32/Makefile.inc (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -29,5 +29,5 @@ BFD_ARCH = mips BFD = binary -GCC_CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 +GCC_CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32 BITS = 32 Index: kernel/arch/mips32/include/cycle.h =================================================================== --- kernel/arch/mips32/include/cycle.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/mips32/include/cycle.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -27,5 +27,5 @@ */ -/** @addtogroup mips2 +/** @addtogroup mips32 * @{ */ Index: kernel/arch/mips32/include/debug.h =================================================================== --- kernel/arch/mips32/include/debug.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/mips32/include/debug.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -34,5 +34,5 @@ #ifndef KERN_mips32_DEBUG_H_ -#define KERN_mips23_DEBUG_H_ +#define KERN_mips32_DEBUG_H_ /** Enter the simulator trace mode */ Index: kernel/arch/mips32/include/mm/frame.h =================================================================== --- kernel/arch/mips32/include/mm/frame.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/mips32/include/mm/frame.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -42,6 +42,4 @@ #ifndef __ASM__ -#include - extern void frame_arch_init(void); extern void physmem_print(void); Index: kernel/arch/mips32/include/stack.h =================================================================== --- kernel/arch/mips32/include/stack.h (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/mips32/include/stack.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -39,12 +39,4 @@ #define STACK_ALIGNMENT 8 -#define STACK_ARG0 0 -#define STACK_ARG1 4 -#define STACK_ARG2 8 -#define STACK_ARG3 12 -#define STACK_ARG4 16 -#define STACK_ARG5 20 -#define STACK_ARG6 24 - #endif Index: kernel/arch/mips32/src/cache.c =================================================================== --- kernel/arch/mips32/src/cache.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/mips32/src/cache.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -27,5 +27,5 @@ */ -/** @addtogroup mips32 +/** @addtogroup mips32 * @{ */ Index: kernel/arch/mips32/src/cpu/cpu.c =================================================================== --- kernel/arch/mips32/src/cpu/cpu.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/mips32/src/cpu/cpu.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -37,5 +37,5 @@ #include #include -#include +#include struct data_t { Index: kernel/arch/mips32/src/fpu_context.c =================================================================== --- kernel/arch/mips32/src/fpu_context.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/mips32/src/fpu_context.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -27,5 +27,5 @@ */ -/** @addtogroup mips32 +/** @addtogroup mips32 * @{ */ @@ -40,5 +40,5 @@ void fpu_disable(void) -{ +{ #ifdef CONFIG_FPU cp0_status_write(cp0_status_read() & ~cp0_status_fpu_bit); Index: kernel/arch/mips32/src/mm/as.c =================================================================== --- kernel/arch/mips32/src/mm/as.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/mips32/src/mm/as.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -61,9 +61,9 @@ /* * Install ASID. - */ + */ hi.value = cp0_entry_hi_read(); hi.asid = as->asid; - cp0_entry_hi_write(hi.value); + cp0_entry_hi_write(hi.value); } Index: kernel/arch/mips32/src/mm/tlb.c =================================================================== --- kernel/arch/mips32/src/mm/tlb.c (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/mips32/src/mm/tlb.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -73,5 +73,5 @@ tlbwi(); } - + /* * The kernel is going to make use of some wired @@ -386,13 +386,10 @@ ASSERT(pte->w || access != PF_ACCESS_WRITE); return pte; - break; case AS_PF_DEFER: *pfrc = AS_PF_DEFER; return NULL; - break; case AS_PF_FAULT: *pfrc = AS_PF_FAULT; return NULL; - break; default: panic("Unexpected rc (%d).", rc); Index: kernel/arch/mips32/src/start.S =================================================================== --- kernel/arch/mips32/src/start.S (revision eca52a800f89d716e768d8312dbea7309e514476) +++ kernel/arch/mips32/src/start.S (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -222,6 +222,5 @@ /* move $k0 pointer to kernel stack */ - lui $k0, %hi(supervisor_sp) - ori $k0, $k0, %lo(supervisor_sp) + la $k0, supervisor_sp /* move $k0 (supervisor_sp) */ Index: kernel/arch/mips64/Makefile.inc =================================================================== --- kernel/arch/mips64/Makefile.inc (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/Makefile.inc (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,64 @@ +# +# Copyright (c) 2005 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. +# + +BFD_ARCH = mips:4000 +BFD = binary +GCC_CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=64 +AFLAGS = -64 + +BITS = 64 + +## Accepted MACHINEs +# + +ifeq ($(MACHINE),msim) + BFD_NAME = elf64-tradlittlemips + ENDIANESS = LE + GCC_CFLAGS += -mhard-float +endif + +ARCH_SOURCES = \ + arch/$(KARCH)/src/start.S \ + arch/$(KARCH)/src/context.S \ + arch/$(KARCH)/src/mips64.c \ + arch/$(KARCH)/src/asm.S \ + arch/$(KARCH)/src/exception.c \ + arch/$(KARCH)/src/interrupt.c \ + arch/$(KARCH)/src/cache.c \ + arch/$(KARCH)/src/debugger.c \ + arch/$(KARCH)/src/cpu/cpu.c \ + arch/$(KARCH)/src/debug/stacktrace.c \ + arch/$(KARCH)/src/debug/stacktrace_asm.S \ + arch/$(KARCH)/src/mm/frame.c \ + arch/$(KARCH)/src/mm/page.c \ + arch/$(KARCH)/src/mm/tlb.c \ + arch/$(KARCH)/src/mm/as.c \ + arch/$(KARCH)/src/fpu_context.c \ + arch/$(KARCH)/src/ddi/ddi.c \ + arch/$(KARCH)/src/smp/dorder.c \ + arch/$(KARCH)/src/smp/smp.c Index: kernel/arch/mips64/_link.ld.in =================================================================== --- kernel/arch/mips64/_link.ld.in (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/_link.ld.in (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,57 @@ +/* + * MIPS64 linker script + * + * kernel text + * kernel data + * + */ + +#undef mips +#define mips mips + +#define KERNEL_LOAD_ADDRESS 0xffffffff80100000 + +OUTPUT_ARCH(mips) +OUTPUT_FORMAT(elf64-tradlittlemips) +ENTRY(kernel_image_start) + +SECTIONS { + . = KERNEL_LOAD_ADDRESS; + .text : { + ktext_start = .; + *(.text); + ktext_end = .; + } + .data : { + kdata_start = .; + *(.data); /* initialized data */ + hardcoded_ktext_size = .; + LONG(ktext_end - ktext_start); + hardcoded_kdata_size = .; + LONG(kdata_end - kdata_start); + hardcoded_load_address = .; + LONG(KERNEL_LOAD_ADDRESS); + *(.rodata*); + *(.sdata); + *(.reginfo); + *(.sbss); + *(.scommon); + *(.bss); /* uninitialized static variables */ + *(COMMON); /* global variables */ + . = ALIGN(8); + symbol_table = .; + *(symtab.*); + } + _gp = . + 0x8000; + .lit8 : { *(.lit8) } + .lit4 : { *(.lit4) } + + kdata_end = .; + + /DISCARD/ : { + *(.mdebug*); + *(.pdr); + *(.comment); + *(.note); + } +} Index: kernel/arch/mips64/include/arch.h =================================================================== --- kernel/arch/mips64/include/arch.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/arch.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2005 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_ARCH_H_ +#define KERN_mips64_ARCH_H_ + +#include + +#define TASKMAP_MAX_RECORDS 32 +#define CPUMAP_MAX_RECORDS 32 +#define BOOTINFO_TASK_NAME_BUFLEN 32 + +extern size_t cpu_count; + +typedef struct { + void *addr; + size_t size; + char name[BOOTINFO_TASK_NAME_BUFLEN]; +} utask_t; + +typedef struct { + uint32_t cpumap; + size_t cnt; + utask_t tasks[TASKMAP_MAX_RECORDS]; +} bootinfo_t; + +extern void arch_pre_main(void *entry, bootinfo_t *bootinfo); + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/asm.h =================================================================== --- kernel/arch/mips64/include/asm.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/asm.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,117 @@ +/* + * Copyright (c) 2003-2004 Jakub Jermar + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_ASM_H_ +#define KERN_mips64_ASM_H_ + +#include +#include +#include + +NO_TRACE static inline void cpu_sleep(void) +{ + /* + * Unfortunatelly most of the simulators do not support + * + * asm volatile ( + * "wait" + * ); + * + */ +} + +/** Return base address of current stack + * + * Return the base address of the current stack. + * The stack is assumed to be STACK_SIZE bytes long. + * The stack must start on page boundary. + * + */ +NO_TRACE static inline uintptr_t get_stack_base(void) +{ + uintptr_t base; + + asm volatile ( + "and %[base], $29, %[mask]\n" + : [base] "=r" (base) + : [mask] "r" (~(STACK_SIZE - 1)) + ); + + return base; +} + +NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v) +{ + *port = v; +} + +NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t v) +{ + *port = v; +} + +NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t v) +{ + *port = v; +} + +NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port) +{ + return *port; +} + +NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port) +{ + return *port; +} + +NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port) +{ + return *port; +} + +extern void cpu_halt(void) __attribute__((noreturn)); +extern void asm_delay_loop(uint32_t); +extern void userspace_asm(uintptr_t, uintptr_t, uintptr_t); + +extern ipl_t interrupts_disable(void); +extern ipl_t interrupts_enable(void); +extern void interrupts_restore(ipl_t); +extern ipl_t interrupts_read(void); +extern bool interrupts_disabled(void); + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/asm/boot.h =================================================================== --- kernel/arch/mips64/include/asm/boot.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/asm/boot.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2005 Ondrej Palkovsky + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_BOOT_H_ +#define KERN_mips64_BOOT_H_ + +/* Temporary stack size for boot process */ +#define TEMP_STACK_SIZE 0x100 + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/asm/regname.h =================================================================== --- kernel/arch/mips64/include/asm/regname.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/asm/regname.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2005 Ondrej Palkovsky + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_REGNAME_H_ +#define KERN_mips64_REGNAME_H_ + +#define zero 0 +#define at 1 +#define v0 2 +#define v1 3 +#define a0 4 +#define a1 5 +#define a2 6 +#define a3 7 +#define t0 8 +#define t1 9 +#define t2 10 +#define t3 11 +#define t4 12 +#define t5 13 +#define t6 14 +#define t7 15 +#define s0 16 +#define s1 17 +#define s2 18 +#define s3 19 +#define s4 20 +#define s5 21 +#define s6 22 +#define s7 23 +#define t8 24 +#define t9 25 +#define k0 26 +#define k1 27 +#define gp 28 +#define sp 29 +#define s8 30 +#define ra 31 + +#define rindex 0 +#define rrandom 1 +#define entrylo0 2 +#define entrylo1 3 +#define context 4 +#define pagemask 5 +#define wired 6 +#define badvaddr 8 +#define count 9 +#define entryhi 10 +#define compare 11 +#define status 12 +#define cause 13 +#define epc 14 +#define rconfig 16 +#define lladdr 17 +#define watchlo 18 +#define watchhi 19 +#define xcontext 20 +#define rdebug 23 +#define depc 24 +#define eepc 30 + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/atomic.h =================================================================== --- kernel/arch/mips64/include/atomic.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/atomic.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2005 Ondrej Palkovsky + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_ATOMIC_H_ +#define KERN_mips64_ATOMIC_H_ + +#include + +#define atomic_inc(x) ((void) atomic_add(x, 1)) +#define atomic_dec(x) ((void) atomic_add(x, -1)) + +#define atomic_postinc(x) (atomic_add(x, 1) - 1) +#define atomic_postdec(x) (atomic_add(x, -1) + 1) + +#define atomic_preinc(x) atomic_add(x, 1) +#define atomic_predec(x) atomic_add(x, -1) + +/* Atomic addition of immediate value. + * + * @param val Memory location to which will be the immediate value added. + * @param i Signed immediate that will be added to *val. + * + * @return Value after addition. + * + */ +NO_TRACE static inline atomic_count_t atomic_add(atomic_t *val, + atomic_count_t i) +{ + atomic_count_t tmp; + atomic_count_t v; + + asm volatile ( + "1:\n" + " lld %0, %1\n" + " daddu %0, %0, %3\n" /* same as daddi, but never traps on overflow */ + " move %2, %0\n" + " scd %0, %1\n" + " beq %0, %4, 1b\n" /* if the atomic operation failed, try again */ + " nop\n" + : "=&r" (tmp), + "+m" (val->count), + "=&r" (v) + : "r" (i), + "i" (0) + ); + + return v; +} + +NO_TRACE static inline atomic_count_t test_and_set(atomic_t *val) +{ + atomic_count_t tmp; + atomic_count_t v; + + asm volatile ( + "1:\n" + " lld %2, %1\n" + " bnez %2, 2f\n" + " dli %0, %3\n" + " scd %0, %1\n" + " beqz %0, 1b\n" + " nop\n" + "2:\n" + : "=&r" (tmp), + "+m" (val->count), + "=&r" (v) + : "i" (1) + ); + + return v; +} + +NO_TRACE static inline void atomic_lock_arch(atomic_t *val) +{ + do { + while (val->count); + } while (test_and_set(val)); +} + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/barrier.h =================================================================== --- kernel/arch/mips64/include/barrier.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/barrier.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2005 Jakub Jermar + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_BARRIER_H_ +#define KERN_mips64_BARRIER_H_ + +/* + * TODO: implement true MIPS memory barriers for macros below. + */ +#define CS_ENTER_BARRIER() asm volatile ("" ::: "memory") +#define CS_LEAVE_BARRIER() asm volatile ("" ::: "memory") + +#define memory_barrier() asm volatile ("" ::: "memory") +#define read_barrier() asm volatile ("" ::: "memory") +#define write_barrier() asm volatile ("" ::: "memory") + +#define smc_coherence(a) +#define smc_coherence_block(a, l) + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/cache.h =================================================================== --- kernel/arch/mips64/include/cache.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/cache.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2003-2004 Jakub Jermar + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_CACHE_H_ +#define KERN_mips64_CACHE_H_ + +#include + +extern void cache_error(istate_t *); + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/context.h =================================================================== --- kernel/arch/mips64/include/context.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/context.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2003-2004 Jakub Jermar + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_CONTEXT_H_ +#define KERN_mips64_CONTEXT_H_ + +#include +#include + +/* + * Put one item onto the stack to support get_stack_base() and align it up. + */ +#define SP_DELTA (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT)) + +#ifndef __ASM__ + +#include + +#define context_set(ctx, pc, stack, size) \ + context_set_generic(ctx, pc, stack, size) + +/* + * Only save registers that must be preserved across + * function calls. + */ +typedef struct { + uintptr_t sp; + uintptr_t pc; + + uint64_t s0; + uint64_t s1; + uint64_t s2; + uint64_t s3; + uint64_t s4; + uint64_t s5; + uint64_t s6; + uint64_t s7; + uint64_t s8; + uint64_t gp; + + ipl_t ipl; +} context_t; + +#endif /* __ASM__ */ + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/context_offset.h =================================================================== --- kernel/arch/mips64/include/context_offset.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/context_offset.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,181 @@ +/* + * Copyright (c) 2005 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. + */ + +#ifndef KERN_mips64_CONTEXT_OFFSET_H_ +#define KERN_mips64_CONTEXT_OFFSET_H_ + +#define OFFSET_SP 0x00 +#define OFFSET_PC 0x08 +#define OFFSET_S0 0x10 +#define OFFSET_S1 0x18 +#define OFFSET_S2 0x20 +#define OFFSET_S3 0x28 +#define OFFSET_S4 0x30 +#define OFFSET_S5 0x38 +#define OFFSET_S6 0x40 +#define OFFSET_S7 0x48 +#define OFFSET_S8 0x50 +#define OFFSET_GP 0x58 + +#ifdef KERNEL + #define OFFSET_IPL 0x60 +#else + #define OFFSET_TLS 0x60 + + #define OFFSET_F20 0x68 + #define OFFSET_F21 0x70 + #define OFFSET_F22 0x78 + #define OFFSET_F23 0x80 + #define OFFSET_F24 0x88 + #define OFFSET_F25 0x90 + #define OFFSET_F26 0x98 + #define OFFSET_F27 0xa0 + #define OFFSET_F28 0xa8 + #define OFFSET_F29 0xb0 + #define OFFSET_F30 0xb8 +#endif /* KERNEL */ + +#ifdef __ASM__ + +#include + +# ctx: address of the structure with saved context +.macro CONTEXT_SAVE_ARCH_CORE ctx:req + sd $s0, OFFSET_S0(\ctx) + sd $s1, OFFSET_S1(\ctx) + sd $s2, OFFSET_S2(\ctx) + sd $s3, OFFSET_S3(\ctx) + sd $s4, OFFSET_S4(\ctx) + sd $s5, OFFSET_S5(\ctx) + sd $s6, OFFSET_S6(\ctx) + sd $s7, OFFSET_S7(\ctx) + sd $s8, OFFSET_S8(\ctx) + sd $gp, OFFSET_GP(\ctx) + +#ifndef KERNEL + sd $k1, OFFSET_TLS(\ctx) + +#ifdef CONFIG_FPU + dmfc1 $t0, $20 + sd $t0, OFFSET_F20(\ctx) + + dmfc1 $t0,$21 + sd $t0, OFFSET_F21(\ctx) + + dmfc1 $t0,$22 + sd $t0, OFFSET_F22(\ctx) + + dmfc1 $t0,$23 + sd $t0, OFFSET_F23(\ctx) + + dmfc1 $t0,$24 + sd $t0, OFFSET_F24(\ctx) + + dmfc1 $t0,$25 + sd $t0, OFFSET_F25(\ctx) + + dmfc1 $t0,$26 + sd $t0, OFFSET_F26(\ctx) + + dmfc1 $t0,$27 + sd $t0, OFFSET_F27(\ctx) + + dmfc1 $t0,$28 + sd $t0, OFFSET_F28(\ctx) + + dmfc1 $t0,$29 + sd $t0, OFFSET_F29(\ctx) + + dmfc1 $t0,$30 + sd $t0, OFFSET_F30(\ctx) +#endif /* CONFIG_FPU */ +#endif /* KERNEL */ + + sd $ra, OFFSET_PC(\ctx) + sd $sp, OFFSET_SP(\ctx) +.endm + +# ctx: address of the structure with saved context +.macro CONTEXT_RESTORE_ARCH_CORE ctx:req + ld $s0, OFFSET_S0(\ctx) + ld $s1, OFFSET_S1(\ctx) + ld $s2, OFFSET_S2(\ctx) + ld $s3, OFFSET_S3(\ctx) + ld $s4, OFFSET_S4(\ctx) + ld $s5, OFFSET_S5(\ctx) + ld $s6, OFFSET_S6(\ctx) + ld $s7, OFFSET_S7(\ctx) + ld $s8, OFFSET_S8(\ctx) + ld $gp, OFFSET_GP(\ctx) + +#ifndef KERNEL + ld $k1, OFFSET_TLS(\ctx) + +#ifdef CONFIG_FPU + ld $t0, OFFSET_F20(\ctx) + dmtc1 $t0,$20 + + ld $t0, OFFSET_F21(\ctx) + dmtc1 $t0,$21 + + ld $t0, OFFSET_F22(\ctx) + dmtc1 $t0,$22 + + ld $t0, OFFSET_F23(\ctx) + dmtc1 $t0,$23 + + ld $t0, OFFSET_F24(\ctx) + dmtc1 $t0,$24 + + ld $t0, OFFSET_F25(\ctx) + dmtc1 $t0,$25 + + ld $t0, OFFSET_F26(\ctx) + dmtc1 $t0,$26 + + ld $t0, OFFSET_F27(\ctx) + dmtc1 $t0,$27 + + ld $t0, OFFSET_F28(\ctx) + dmtc1 $t0,$28 + + ld $t0, OFFSET_F29(\ctx) + dmtc1 $t0,$29 + + ld $t0, OFFSET_F30(\ctx) + dmtc1 $t0,$30 +#endif /* CONFIG_FPU */ +#endif /* KERNEL */ + + ld $ra, OFFSET_PC(\ctx) + ld $sp, OFFSET_SP(\ctx) +.endm + +#endif /* __ASM__ */ + +#endif Index: kernel/arch/mips64/include/cp0.h =================================================================== --- kernel/arch/mips64/include/cp0.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/cp0.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,143 @@ +/* + * Copyright (c) 2003-2004 Jakub Jermar + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_CP0_H_ +#define KERN_mips64_CP0_H_ + +#ifdef KERNEL + +#include + +#else + +#include + +#endif + +#define cp0_status_ie_enabled_bit (1 << 0) +#define cp0_status_exl_exception_bit (1 << 1) +#define cp0_status_erl_error_bit (1 << 2) +#define cp0_status_um_bit (1 << 4) +#define cp0_status_bev_bootstrap_bit (1 << 22) +#define cp0_status_fpu_bit (1 << 29) + +#define cp0_status_im_shift 8 +#define cp0_status_im_mask 0xff00 + +#define cp0_cause_excno(cause) ((cause >> 2) & 0x1f) +#define cp0_cause_coperr(cause) ((cause >> 28) & 0x3) + +#define fpu_cop_id 1 + +/* + * Magic value for use in msim. + */ +#define cp0_compare_value 100000 + +#define cp0_mask_all_int() \ + cp0_status_write(cp0_status_read() & ~(cp0_status_im_mask)) + +#define cp0_unmask_all_int() \ + cp0_status_write(cp0_status_read() | cp0_status_im_mask) + +#define cp0_mask_int(it) \ + cp0_status_write(cp0_status_read() & ~(1 << (cp0_status_im_shift + (it)))) + +#define cp0_unmask_int(it) \ + cp0_status_write(cp0_status_read() | (1 << (cp0_status_im_shift + (it)))) + +#define GEN_READ_CP0(nm,reg) static inline uint64_t cp0_ ##nm##_read(void) \ + { \ + uint64_t retval; \ + asm volatile ( \ + "dmfc0 %0, $" #reg \ + : "=r" (retval) \ + ); \ + return retval; \ + } + +#define GEN_WRITE_CP0(nm,reg) static inline void cp0_ ##nm##_write(uint32_t val) \ + { \ + asm volatile ( \ + "dmtc0 %0, $" #reg \ + :: "r" (val) \ + ); \ + } + +GEN_READ_CP0(index, 0); +GEN_WRITE_CP0(index, 0); + +GEN_READ_CP0(random, 1); + +GEN_READ_CP0(entry_lo0, 2); +GEN_WRITE_CP0(entry_lo0, 2); + +GEN_READ_CP0(entry_lo1, 3); +GEN_WRITE_CP0(entry_lo1, 3); + +GEN_READ_CP0(context, 4); +GEN_WRITE_CP0(context, 4); + +GEN_READ_CP0(pagemask, 5); +GEN_WRITE_CP0(pagemask, 5); + +GEN_READ_CP0(wired, 6); +GEN_WRITE_CP0(wired, 6); + +GEN_READ_CP0(badvaddr, 8); + +GEN_READ_CP0(count, 9); +GEN_WRITE_CP0(count, 9); + +GEN_READ_CP0(entry_hi, 10); +GEN_WRITE_CP0(entry_hi, 10); + +GEN_READ_CP0(compare, 11); +GEN_WRITE_CP0(compare, 11); + +GEN_READ_CP0(status, 12); +GEN_WRITE_CP0(status, 12); + +GEN_READ_CP0(cause, 13); +GEN_WRITE_CP0(cause, 13); + +GEN_READ_CP0(epc, 14); +GEN_WRITE_CP0(epc, 14); + +GEN_READ_CP0(prid, 15); + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/cpu.h =================================================================== --- kernel/arch/mips64/include/cpu.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/cpu.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2003-2004 Jakub Jermar + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_CPU_H_ +#define KERN_mips64_CPU_H_ + +#include +#include + +typedef struct { + uint32_t imp_num; + uint32_t rev_num; +} cpu_arch_t; + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/cycle.h =================================================================== --- kernel/arch/mips64/include/cycle.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/cycle.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2006 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_CYCLE_H_ +#define KERN_mips64_CYCLE_H_ + +#include +#include +#include + +NO_TRACE static inline uint64_t get_cycle(void) +{ + return ((uint64_t) count_hi << 32) + ((uint64_t) cp0_count_read()); +} + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/debug.h =================================================================== --- kernel/arch/mips64/include/debug.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/debug.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2005 Ondrej Palkovsky + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_DEBUG_H_ +#define KERN_mips64_DEBUG_H_ + +/** Enter the simulator trace mode */ +#define ___traceon() \ + asm volatile ( \ + "\t.word\t0x39\n" \ + ); + +/** Leave the simulator trace mode */ +#define ___traceoff() \ + asm volatile ( \ + "\t.word\t0x3d\n" \ + ); + +/** Ask the simulator to dump registers */ +#define ___regview() \ + asm volatile ( \ + "\t.word\t0x37\n" \ + ); + +/** Halt the simulator */ +#define ___halt() \ + asm volatile ( \ + "\t.word\t0x28\n" \ + ); + +/** Enter the simulator interactive mode */ +#define ___intmode() \ + asm volatile ( \ + "\t.word\t0x29\n" \ + ); + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/debugger.h =================================================================== --- kernel/arch/mips64/include/debugger.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/debugger.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2005 Ondrej Palkovsky + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_DEBUGGER_H_ +#define KERN_mips64_DEBUGGER_H_ + +#include +#include + +#define BKPOINTS_MAX 10 + +/** Breakpoint was shot */ +#define BKPOINT_INPROG (1 << 0) + +/** One-time breakpoint, mandatory for j/b instructions */ +#define BKPOINT_ONESHOT (1 << 1) + +/** + * Breakpoint is set on the next instruction, so that it + * could be reinstalled on the previous one + */ +#define BKPOINT_REINST (1 << 2) + +/** Call a predefined function */ +#define BKPOINT_FUNCCALL (1 << 3) + + +typedef struct { + uintptr_t address; /**< Breakpoint address */ + sysarg_t instruction; /**< Original instruction */ + sysarg_t nextinstruction; /**< Original instruction following break */ + unsigned int flags; /**< Flags regarding breakpoint */ + size_t counter; + void (*bkfunc)(void *, istate_t *); +} bpinfo_t; + +extern bpinfo_t breakpoints[BKPOINTS_MAX]; + +extern bool is_jump(sysarg_t); + +extern void debugger_init(void); +extern void debugger_bpoint(istate_t *); + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/drivers/msim.h =================================================================== --- kernel/arch/mips64/include/drivers/msim.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/drivers/msim.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2005 Ondrej Palkovsky + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_MSIM_H_ +#define KERN_mips64_MSIM_H_ + +/** Address of devices. */ +#define MSIM_VIDEORAM 0xffffffff90000000 +#define MSIM_KBD_ADDRESS 0xffffffff90000000 +#define MSIM_KBD_IRQ 2 + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/elf.h =================================================================== --- kernel/arch/mips64/include/elf.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/elf.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2006 Sergey Bondari + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_ELF_H_ +#define KERN_mips64_ELF_H_ + +#define ELF_MACHINE EM_MIPS + +#ifdef __BE__ + #define ELF_DATA_ENCODING ELFDATA2MSB +#else + #define ELF_DATA_ENCODING ELFDATA2LSB +#endif + +#define ELF_CLASS ELFCLASS64 + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/exception.h =================================================================== --- kernel/arch/mips64/include/exception.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/exception.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2003-2004 Jakub Jermar + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_EXCEPTION_H_ +#define KERN_mips64_EXCEPTION_H_ + +#include +#include + +#define EXC_Int 0 +#define EXC_Mod 1 +#define EXC_TLBL 2 +#define EXC_TLBS 3 +#define EXC_AdEL 4 +#define EXC_AdES 5 +#define EXC_IBE 6 +#define EXC_DBE 7 +#define EXC_Sys 8 +#define EXC_Bp 9 +#define EXC_RI 10 +#define EXC_CpU 11 +#define EXC_Ov 12 +#define EXC_Tr 13 +#define EXC_VCEI 14 +#define EXC_FPE 15 +#define EXC_WATCH 23 +#define EXC_VCED 31 + +extern void exception(istate_t *istate); +extern void tlb_refill_entry(void); +extern void exception_entry(void); +extern void cache_error_entry(void); +extern void exception_init(void); + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/faddr.h =================================================================== --- kernel/arch/mips64/include/faddr.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/faddr.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2005 Jakub Jermar + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_FADDR_H_ +#define KERN_mips64_FADDR_H_ + +#include + +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/fpu_context.h =================================================================== --- kernel/arch/mips64/include/fpu_context.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/fpu_context.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2005 Jakub Vana + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_FPU_CONTEXT_H_ +#define KERN_mips64_FPU_CONTEXT_H_ + +#include + +#define FPU_CONTEXT_ALIGN sizeof(sysarg_t) + +typedef struct { + sysarg_t dregs[32]; + sysarg_t cregs[32]; +} fpu_context_t; + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/interrupt.h =================================================================== --- kernel/arch/mips64/include/interrupt.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/interrupt.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2003-2004 Jakub Jermar + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_INTERRUPT_H_ +#define KERN_mips64_INTERRUPT_H_ + +#include +#include + +#define IVT_ITEMS 32 +#define IVT_FIRST 0 + +#define VECTOR_TLB_SHOOTDOWN_IPI EXC_Int + +extern function virtual_timer_fnc; +extern uint32_t count_hi; + +extern void interrupt_init(void); + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/istate.h =================================================================== --- kernel/arch/mips64/include/istate.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/istate.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2003-2004 Jakub Jermar + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_ISTATE_H_ +#define KERN_mips64_ISTATE_H_ + +#include + +#ifdef KERNEL + +#include +#include + +#else + +#include +#define NO_TRACE + +#endif + +typedef struct istate { + /* + * The first seven registers are arranged so that the istate structure + * can be used both for exception handlers and for the syscall handler. + */ + uint64_t a0; /* arg1 */ + uint64_t a1; /* arg2 */ + uint64_t a2; /* arg3 */ + uint64_t a3; /* arg4 */ + uint64_t t0; /* arg5 */ + uint64_t t1; /* arg6 */ + uint64_t v0; /* arg7 */ + uint64_t v1; + uint64_t at; + uint64_t t2; + uint64_t t3; + uint64_t t4; + uint64_t t5; + uint64_t t6; + uint64_t t7; + uint64_t s0; + uint64_t s1; + uint64_t s2; + uint64_t s3; + uint64_t s4; + uint64_t s5; + uint64_t s6; + uint64_t s7; + uint64_t t8; + uint64_t t9; + uint64_t kt0; + uint64_t kt1; /* We use it as thread-local pointer */ + uint64_t gp; + uint64_t sp; + uint64_t s8; + uint64_t ra; + + uint64_t lo; + uint64_t hi; + + uint64_t status; /* cp0_status */ + uint64_t epc; /* cp0_epc */ +} istate_t; + +NO_TRACE static inline void istate_set_retaddr(istate_t *istate, + uintptr_t retaddr) +{ + istate->epc = retaddr; +} + +/** Return true if exception happened while in userspace */ +NO_TRACE static inline int istate_from_uspace(istate_t *istate) +{ + return istate->status & cp0_status_um_bit; +} + +NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->epc; +} + +NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->sp; +} + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/mm/as.h =================================================================== --- kernel/arch/mips64/include/mm/as.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/mm/as.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2005 Jakub Jermar + * 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 mips64mm + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_AS_H_ +#define KERN_mips64_AS_H_ + +#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH 0 + +#define KERNEL_ADDRESS_SPACE_START_ARCH UINT64_C(0xffffffff80000000) +#define KERNEL_ADDRESS_SPACE_END_ARCH UINT64_C(0xffffffff9fffffff) +#define USER_ADDRESS_SPACE_START_ARCH UINT64_C(0x0000000000000000) +#define USER_ADDRESS_SPACE_END_ARCH UINT32_C(0x000000ffffffffff) + +typedef struct { +} as_arch_t; + +#include + +#define as_constructor_arch(as, flags) (as != as) +#define as_destructor_arch(as) (as != as) +#define as_create_arch(as, flags) (as != as) +#define as_deinstall_arch(as) +#define as_invalidate_translation_cache(as, page, cnt) + +extern void as_arch_init(void); + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/mm/asid.h =================================================================== --- kernel/arch/mips64/include/mm/asid.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/mm/asid.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2005 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 mips64mm + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_ASID_H_ +#define KERN_mips64_ASID_H_ + +#include + +#define ASID_MAX_ARCH 255 /* 2^8 - 1 */ + +typedef uint8_t asid_t; + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/mm/frame.h =================================================================== --- kernel/arch/mips64/include/mm/frame.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/mm/frame.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2005 Jakub Jermar + * 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 mips64mm + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_FRAME_H_ +#define KERN_mips64_FRAME_H_ + +#define FRAME_WIDTH 14 /* 16K */ +#define FRAME_SIZE (1 << FRAME_WIDTH) + +#ifdef KERNEL +#ifndef __ASM__ + +extern void frame_arch_init(void); +extern void physmem_print(void); + +#endif /* __ASM__ */ +#endif /* KERNEL */ + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/mm/page.h =================================================================== --- kernel/arch/mips64/include/mm/page.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/mm/page.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2003-2004 Jakub Jermar + * 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 mips64mm + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_PAGE_H_ +#define KERN_mips64_PAGE_H_ + +#include +#include + +#define PAGE_WIDTH FRAME_WIDTH +#define PAGE_SIZE FRAME_SIZE + +#ifndef __ASM__ + #define KA2PA(addr) (((uintptr_t) (addr)) - 0xffffffff80000000) + #define PA2KA(addr) (((uintptr_t) (addr)) + 0xffffffff80000000) +#else + #define KA2PA(addr) ((addr) - 0xffffffff80000000) + #define PA2KA(addr) ((addr) + 0xffffffff80000000) +#endif + +#ifdef KERNEL +#ifndef __ASM__ + +extern void page_arch_init(void); + +#endif /* __ASM__ */ +#endif /* KERNEL */ + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/mm/tlb.h =================================================================== --- kernel/arch/mips64/include/mm/tlb.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/mm/tlb.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,181 @@ +/* + * Copyright (c) 2003-2004 Jakub Jermar + * 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 mips64mm + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_TLB_H_ +#define KERN_mips64_TLB_H_ + +#include +#include +#include +#include + +#define TLB_ENTRY_COUNT 48 + +#define TLB_WIRED 1 +#define TLB_KSTACK_WIRED_INDEX 0 + +#define TLB_PAGE_MASK_4K (0x000 << 13) +#define TLB_PAGE_MASK_16K (0x003 << 13) +#define TLB_PAGE_MASK_64K (0x00f << 13) +#define TLB_PAGE_MASK_256K (0x03f << 13) +#define TLB_PAGE_MASK_1M (0x0ff << 13) +#define TLB_PAGE_MASK_4M (0x3ff << 13) +#define TLB_PAGE_MASK_16M (0xfff << 13) + +#define PAGE_UNCACHED 2 +#define PAGE_CACHEABLE_EXC_WRITE 5 + +typedef union { + struct { +#ifdef __BE__ + unsigned int : 2; /* zero */ + unsigned int pfn : 24; /* frame number */ + unsigned int c : 3; /* cache coherency attribute */ + unsigned int d : 1; /* dirty/write-protect bit */ + unsigned int v : 1; /* valid bit */ + unsigned int g : 1; /* global bit */ +#else + unsigned int g : 1; /* global bit */ + unsigned int v : 1; /* valid bit */ + unsigned int d : 1; /* dirty/write-protect bit */ + unsigned int c : 3; /* cache coherency attribute */ + unsigned int pfn : 24; /* frame number */ + unsigned int : 2; /* zero */ +#endif + } __attribute__ ((packed)); + uint32_t value; +} entry_lo_t; + +typedef union { + struct { +#ifdef __BE__ + unsigned int vpn2 : 19; + unsigned int : 5; + unsigned int asid : 8; +#else + unsigned int asid : 8; + unsigned int : 5; + unsigned int vpn2 : 19; +#endif + } __attribute__ ((packed)); + uint32_t value; +} entry_hi_t; + +typedef union { + struct { +#ifdef __BE__ + unsigned int : 7; + unsigned int mask : 12; + unsigned int : 13; +#else + unsigned int : 13; + unsigned int mask : 12; + unsigned int : 7; +#endif + } __attribute__ ((packed)); + uint32_t value; +} page_mask_t; + +typedef union { + struct { +#ifdef __BE__ + unsigned int p : 1; + unsigned int : 27; + unsigned int index : 4; +#else + unsigned int index : 4; + unsigned int : 27; + unsigned int p : 1; +#endif + } __attribute__ ((packed)); + uint32_t value; +} tlb_index_t; + +/** Probe TLB for Matching Entry + * + * Probe TLB for Matching Entry. + */ +NO_TRACE static inline void tlbp(void) +{ + asm volatile ( + "tlbp\n\t" + ); +} + +/** Read Indexed TLB Entry + * + * Read Indexed TLB Entry. + */ +NO_TRACE static inline void tlbr(void) +{ + asm volatile ( + "tlbr\n\t" + ); +} + +/** Write Indexed TLB Entry + * + * Write Indexed TLB Entry. + */ +NO_TRACE static inline void tlbwi(void) +{ + asm volatile ( + "tlbwi\n\t" + ); +} + +/** Write Random TLB Entry + * + * Write Random TLB Entry. + */ +NO_TRACE static inline void tlbwr(void) +{ + asm volatile ( + "tlbwr\n\t" + ); +} + +#define tlb_invalidate(asid) tlb_invalidate_asid(asid) + +extern void tlb_invalid(istate_t *); +extern void tlb_refill(istate_t *); +extern void tlb_modified(istate_t *); +extern void tlb_prepare_entry_lo(entry_lo_t *, bool, bool, bool, bool, + uintptr_t); +extern void tlb_prepare_entry_hi(entry_hi_t *, asid_t, uintptr_t); + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/proc/task.h =================================================================== --- kernel/arch/mips64/include/proc/task.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/proc/task.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2006 Jakub Jermar + * 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 mips64proc + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_TASK_H_ +#define KERN_mips64_TASK_H_ + +typedef struct { +} task_arch_t; + +#define task_create_arch(task) +#define task_destroy_arch(task) + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/proc/thread.h =================================================================== --- kernel/arch/mips64/include/proc/thread.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/proc/thread.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2003-2004 Jakub Jermar + * 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 mips64proc + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_THREAD_H_ +#define KERN_mips64_THREAD_H_ + +typedef struct { +} thread_arch_t; + +#define thr_constructor_arch(thread) +#define thr_destructor_arch(thread) +#define thread_create_arch(thread) + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/smp/dorder.h =================================================================== --- kernel/arch/mips64/include/smp/dorder.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/smp/dorder.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,46 @@ +/* + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_DORDER_H_ +#define KERN_mips64_DORDER_H_ + +#include + +extern uint32_t dorder_cpuid(void); +extern void dorder_ipi_ack(uint32_t); + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/stack.h =================================================================== --- kernel/arch/mips64/include/stack.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/stack.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2006 Josef Cejka + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_STACK_H_ +#define KERN_mips64_STACK_H_ + +#define STACK_ITEM_SIZE 8 +#define STACK_ALIGNMENT 8 + +#endif + +/** @} + */ Index: kernel/arch/mips64/include/types.h =================================================================== --- kernel/arch/mips64/include/types.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/include/types.h (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2003-2004 Jakub Jermar + * 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 mips64 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips64_TYPES_H_ +#define KERN_mips64_TYPES_H_ + +typedef uint64_t size_t; +typedef int64_t ssize_t; + +typedef uint64_t uintptr_t; +typedef uint64_t pfn_t; + +typedef uint64_t ipl_t; + +typedef uint64_t sysarg_t; +typedef int64_t native_t; +typedef uint64_t atomic_count_t; + +typedef struct { +} fncptr_t; + +#define INTN_C(c) INT64_C(c) +#define UINTN_C(c) UINT64_C(c) + +#define PRIdn PRId64 /**< Format for native_t. */ +#define PRIun PRIu64 /**< Format for sysarg_t. */ +#define PRIxn PRIx64 /**< Format for hexadecimal sysarg_t. */ +#define PRIua PRIu64 /**< Format for atomic_count_t. */ + +#endif + +/** @} + */ Index: kernel/arch/mips64/src/asm.S =================================================================== --- kernel/arch/mips64/src/asm.S (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/src/asm.S (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,301 @@ +/* + * Copyright (c) 2003 Jakub Jermar + * 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. + */ + +#include + +.text + +.macro cp0_read reg + dmfc0 $2, \reg + j $31 + nop +.endm + +.macro cp0_write reg + dmtc0 $4, \reg + j $31 + nop +.endm + +.set noat +.set noreorder +.set nomacro + +.global asm_delay_loop +asm_delay_loop: + j $31 + nop + +.global cpu_halt +cpu_halt: + j cpu_halt + nop + +.global memcpy_from_uspace +.global memcpy_to_uspace +.global memcpy_from_uspace_failover_address +.global memcpy_to_uspace_failover_address +memcpy_from_uspace: +memcpy_to_uspace: + move $t2, $a0 /* save dst */ + + addiu $v0, $a1, 3 + li $v1, -4 /* 0xfffffffffffffffc */ + and $v0, $v0, $v1 + beq $a1, $v0, 3f + move $t0, $a0 + + 0: + beq $a2, $zero, 2f + move $a3, $zero + + 1: + addu $v0, $a1, $a3 + lbu $a0, 0($v0) + addu $v1, $t0, $a3 + addiu $a3, $a3, 1 + bne $a3, $a2, 1b + sb $a0, 0($v1) + + 2: + jr $ra + move $v0, $t2 + + 3: + addiu $v0, $a0, 3 + and $v0, $v0, $v1 + bne $a0, $v0, 0b + srl $t1, $a2, 2 + + beq $t1, $zero, 5f + move $a3, $zero + + move $a3, $zero + move $a0, $zero + + 4: + addu $v0, $a1, $a0 + lw $v1, 0($v0) + addiu $a3, $a3, 1 + addu $v0, $t0, $a0 + sw $v1, 0($v0) + bne $a3, $t1, 4b + addiu $a0, $a0, 4 + + 5: + andi $a2, $a2, 0x3 + beq $a2, $zero, 2b + nop + + sll $v0, $a3, 2 + addu $t1, $v0, $t0 + move $a3, $zero + addu $t0, $v0, $a1 + + 6: + addu $v0, $t0, $a3 + lbu $a0, 0($v0) + addu $v1, $t1, $a3 + addiu $a3, $a3, 1 + bne $a3, $a2, 6b + sb $a0, 0($v1) + + jr $ra + move $v0, $t2 + +memcpy_from_uspace_failover_address: +memcpy_to_uspace_failover_address: + jr $ra + move $v0, $zero + +.macro fpu_gp_save reg ctx + mfc1 $t0, $\reg + sw $t0, \reg * 4(\ctx) +.endm + +.macro fpu_gp_restore reg ctx + lw $t0, \reg * 4(\ctx) + mtc1 $t0, $\reg +.endm + +.macro fpu_ct_save reg ctx + cfc1 $t0, $1 + sw $t0, (\reg + 32) * 4(\ctx) +.endm + +.macro fpu_ct_restore reg ctx + lw $t0, (\reg + 32) * 4(\ctx) + ctc1 $t0, $\reg +.endm + +.global fpu_context_save +fpu_context_save: +#ifdef CONFIG_FPU + fpu_gp_save 0, $a0 + fpu_gp_save 1, $a0 + fpu_gp_save 2, $a0 + fpu_gp_save 3, $a0 + fpu_gp_save 4, $a0 + fpu_gp_save 5, $a0 + fpu_gp_save 6, $a0 + fpu_gp_save 7, $a0 + fpu_gp_save 8, $a0 + fpu_gp_save 9, $a0 + fpu_gp_save 10, $a0 + fpu_gp_save 11, $a0 + fpu_gp_save 12, $a0 + fpu_gp_save 13, $a0 + fpu_gp_save 14, $a0 + fpu_gp_save 15, $a0 + fpu_gp_save 16, $a0 + fpu_gp_save 17, $a0 + fpu_gp_save 18, $a0 + fpu_gp_save 19, $a0 + fpu_gp_save 20, $a0 + fpu_gp_save 21, $a0 + fpu_gp_save 22, $a0 + fpu_gp_save 23, $a0 + fpu_gp_save 24, $a0 + fpu_gp_save 25, $a0 + fpu_gp_save 26, $a0 + fpu_gp_save 27, $a0 + fpu_gp_save 28, $a0 + fpu_gp_save 29, $a0 + fpu_gp_save 30, $a0 + fpu_gp_save 31, $a0 + + fpu_ct_save 1, $a0 + fpu_ct_save 2, $a0 + fpu_ct_save 3, $a0 + fpu_ct_save 4, $a0 + fpu_ct_save 5, $a0 + fpu_ct_save 6, $a0 + fpu_ct_save 7, $a0 + fpu_ct_save 8, $a0 + fpu_ct_save 9, $a0 + fpu_ct_save 10, $a0 + fpu_ct_save 11, $a0 + fpu_ct_save 12, $a0 + fpu_ct_save 13, $a0 + fpu_ct_save 14, $a0 + fpu_ct_save 15, $a0 + fpu_ct_save 16, $a0 + fpu_ct_save 17, $a0 + fpu_ct_save 18, $a0 + fpu_ct_save 19, $a0 + fpu_ct_save 20, $a0 + fpu_ct_save 21, $a0 + fpu_ct_save 22, $a0 + fpu_ct_save 23, $a0 + fpu_ct_save 24, $a0 + fpu_ct_save 25, $a0 + fpu_ct_save 26, $a0 + fpu_ct_save 27, $a0 + fpu_ct_save 28, $a0 + fpu_ct_save 29, $a0 + fpu_ct_save 30, $a0 + fpu_ct_save 31, $a0 +#endif + j $ra + nop + +.global fpu_context_restore +fpu_context_restore: +#ifdef CONFIG_FPU + fpu_gp_restore 0, $a0 + fpu_gp_restore 1, $a0 + fpu_gp_restore 2, $a0 + fpu_gp_restore 3, $a0 + fpu_gp_restore 4, $a0 + fpu_gp_restore 5, $a0 + fpu_gp_restore 6, $a0 + fpu_gp_restore 7, $a0 + fpu_gp_restore 8, $a0 + fpu_gp_restore 9, $a0 + fpu_gp_restore 10, $a0 + fpu_gp_restore 11, $a0 + fpu_gp_restore 12, $a0 + fpu_gp_restore 13, $a0 + fpu_gp_restore 14, $a0 + fpu_gp_restore 15, $a0 + fpu_gp_restore 16, $a0 + fpu_gp_restore 17, $a0 + fpu_gp_restore 18, $a0 + fpu_gp_restore 19, $a0 + fpu_gp_restore 20, $a0 + fpu_gp_restore 21, $a0 + fpu_gp_restore 22, $a0 + fpu_gp_restore 23, $a0 + fpu_gp_restore 24, $a0 + fpu_gp_restore 25, $a0 + fpu_gp_restore 26, $a0 + fpu_gp_restore 27, $a0 + fpu_gp_restore 28, $a0 + fpu_gp_restore 29, $a0 + fpu_gp_restore 30, $a0 + fpu_gp_restore 31, $a0 + + fpu_ct_restore 1, $a0 + fpu_ct_restore 2, $a0 + fpu_ct_restore 3, $a0 + fpu_ct_restore 4, $a0 + fpu_ct_restore 5, $a0 + fpu_ct_restore 6, $a0 + fpu_ct_restore 7, $a0 + fpu_ct_restore 8, $a0 + fpu_ct_restore 9, $a0 + fpu_ct_restore 10, $a0 + fpu_ct_restore 11, $a0 + fpu_ct_restore 12, $a0 + fpu_ct_restore 13, $a0 + fpu_ct_restore 14, $a0 + fpu_ct_restore 15, $a0 + fpu_ct_restore 16, $a0 + fpu_ct_restore 17, $a0 + fpu_ct_restore 18, $a0 + fpu_ct_restore 19, $a0 + fpu_ct_restore 20, $a0 + fpu_ct_restore 21, $a0 + fpu_ct_restore 22, $a0 + fpu_ct_restore 23, $a0 + fpu_ct_restore 24, $a0 + fpu_ct_restore 25, $a0 + fpu_ct_restore 26, $a0 + fpu_ct_restore 27, $a0 + fpu_ct_restore 28, $a0 + fpu_ct_restore 29, $a0 + fpu_ct_restore 30, $a0 + fpu_ct_restore 31, $a0 +#endif + j $ra + nop + +.global early_putchar +early_putchar: + j $ra + nop Index: kernel/arch/mips64/src/cache.c =================================================================== --- kernel/arch/mips64/src/cache.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/src/cache.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,1 @@ +../../mips32/src/cache.c Index: kernel/arch/mips64/src/context.S =================================================================== --- kernel/arch/mips64/src/context.S (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/src/context.S (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,1 @@ +../../mips32/src/context.S Index: kernel/arch/mips64/src/cpu =================================================================== --- kernel/arch/mips64/src/cpu (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/src/cpu (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,1 @@ +../../mips32/src/cpu Index: kernel/arch/mips64/src/ddi =================================================================== --- kernel/arch/mips64/src/ddi (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/src/ddi (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,1 @@ +../../mips32/src/ddi Index: kernel/arch/mips64/src/debug =================================================================== --- kernel/arch/mips64/src/debug (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/src/debug (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,1 @@ +../../mips32/src/debug Index: kernel/arch/mips64/src/debugger.c =================================================================== --- kernel/arch/mips64/src/debugger.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/src/debugger.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,1 @@ +../../mips32/src/debugger.c Index: kernel/arch/mips64/src/exception.c =================================================================== --- kernel/arch/mips64/src/exception.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/src/exception.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,231 @@ +/* + * Copyright (c) 2003-2004 Jakub Jermar + * 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 mips64 + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static const char *exctable[] = { + "Interrupt", + "TLB Modified", + "TLB Invalid", + "TLB Invalid Store", + "Address Error - load/instr. fetch", + "Address Error - store", + "Bus Error - fetch instruction", + "Bus Error - data reference", + "Syscall", + "BreakPoint", + "Reserved Instruction", + "Coprocessor Unusable", + "Arithmetic Overflow", + "Trap", + "Virtual Coherency - instruction", + "Floating Point", + NULL, NULL, NULL, NULL, NULL, NULL, NULL, + "WatchHi/WatchLo", /* 23 */ + NULL, NULL, NULL, NULL, NULL, NULL, NULL, + "Virtual Coherency - data", +}; + +void istate_decode(istate_t *istate) +{ + printf("epc=%#018" PRIx64 "\tsta=%#018" PRIx64 "\t" + "lo =%#018" PRIx64 "\thi =%#018" PRIx64 "\n", + istate->epc, istate->status, istate->lo, istate->hi); + + printf("a0 =%#018" PRIx64 "\ta1 =%#018" PRIx64 "\t" + "a2 =%#018" PRIx64 "\ta3 =%#018" PRIx64 "\n", + istate->a0, istate->a1, istate->a2, istate->a3); + + printf("t0 =%#018" PRIx64 "\tt1 =%#018" PRIx64 "\t" + "t2 =%#018" PRIx64 "\tt3 =%#018" PRIx64 "\n", + istate->t0, istate->t1, istate->t2, istate->t3); + + printf("t4 =%#018" PRIx64 "\tt5 =%#018" PRIx64 "\t" + "t6 =%#018" PRIx64 "\tt7 =%#018" PRIx64 "\n", + istate->t4, istate->t5, istate->t6, istate->t7); + + printf("t8 =%#018" PRIx64 "\tt9 =%#018" PRIx64 "\t" + "v0 =%#018" PRIx64 "\tv1 =%#018" PRIx64 "\n", + istate->t8, istate->t9, istate->v0, istate->v1); + + printf("s0 =%#018" PRIx64 "\ts1 =%#018" PRIx64 "\t" + "s2 =%#018" PRIx64 "\ts3 =%#018" PRIx64 "\n", + istate->s0, istate->s1, istate->s2, istate->s3); + + printf("s4 =%#018" PRIx64 "\ts5 =%#018" PRIx64 "\t" + "s6 =%#018" PRIx64 "\ts7 =%#018" PRIx64 "\n", + istate->s4, istate->s5, istate->s6, istate->s7); + + printf("s8 =%#018" PRIx64 "\tat =%#018" PRIx64 "\t" + "kt0=%#018" PRIx64 "\tkt1=%#018" PRIx64 "\n", + istate->s8, istate->at, istate->kt0, istate->kt1); + + printf("sp =%#018" PRIx64 "\tra =%#018" PRIx64 "\t" + "gp =%#018" PRIx64 "\n", + istate->sp, istate->ra, istate->gp); +} + +static void unhandled_exception(unsigned int n, istate_t *istate) +{ + fault_if_from_uspace(istate, "Unhandled exception %s.", exctable[n]); + panic_badtrap(istate, n, "Unhandled exception %s.", exctable[n]); +} + +static void reserved_instr_exception(unsigned int n, istate_t *istate) +{ + if (*((uint32_t *) istate->epc) == 0x7c03e83b) { + ASSERT(THREAD); + istate->epc += 4; + istate->v1 = istate->kt1; + } else + unhandled_exception(n, istate); +} + +static void breakpoint_exception(unsigned int n, istate_t *istate) +{ +#ifdef CONFIG_DEBUG + debugger_bpoint(istate); +#else + /* it is necessary to not re-execute BREAK instruction after + returning from Exception handler + (see page 138 in R4000 Manual for more information) */ + istate->epc += 4; +#endif +} + +static void tlbmod_exception(unsigned int n, istate_t *istate) +{ + tlb_modified(istate); +} + +static void tlbinv_exception(unsigned int n, istate_t *istate) +{ + tlb_invalid(istate); +} + +#ifdef CONFIG_FPU_LAZY +static void cpuns_exception(unsigned int n, istate_t *istate) +{ + if (cp0_cause_coperr(cp0_cause_read()) == fpu_cop_id) + scheduler_fpu_lazy_request(); + else { + fault_if_from_uspace(istate, + "Unhandled Coprocessor Unusable Exception."); + panic_badtrap(istate, n, + "Unhandled Coprocessor Unusable Exception."); + } +} +#endif + +static void interrupt_exception(unsigned int n, istate_t *istate) +{ + /* Decode interrupt number and process the interrupt */ + uint32_t cause = (cp0_cause_read() >> 8) & 0xff; + + unsigned int i; + for (i = 0; i < 8; i++) { + if (cause & (1 << i)) { + irq_t *irq = irq_dispatch_and_lock(i); + if (irq) { + /* + * The IRQ handler was found. + */ + irq->handler(irq); + irq_spinlock_unlock(&irq->lock, false); + } else { + /* + * Spurious interrupt. + */ +#ifdef CONFIG_DEBUG + printf("cpu%u: spurious interrupt (inum=%u)\n", + CPU->id, i); +#endif + } + } + } +} + +/** Handle syscall userspace call */ +static void syscall_exception(unsigned int n, istate_t *istate) +{ + fault_if_from_uspace(istate, "Syscall is handled through shortcut."); +} + +void exception_init(void) +{ + unsigned int i; + + /* Clear exception table */ + for (i = 0; i < IVT_ITEMS; i++) + exc_register(i, "undef", false, + (iroutine_t) unhandled_exception); + + exc_register(EXC_Bp, "bkpoint", true, + (iroutine_t) breakpoint_exception); + exc_register(EXC_RI, "resinstr", true, + (iroutine_t) reserved_instr_exception); + exc_register(EXC_Mod, "tlb_mod", true, + (iroutine_t) tlbmod_exception); + exc_register(EXC_TLBL, "tlbinvl", true, + (iroutine_t) tlbinv_exception); + exc_register(EXC_TLBS, "tlbinvl", true, + (iroutine_t) tlbinv_exception); + exc_register(EXC_Int, "interrupt", true, + (iroutine_t) interrupt_exception); + +#ifdef CONFIG_FPU_LAZY + exc_register(EXC_CpU, "cpunus", true, + (iroutine_t) cpuns_exception); +#endif + + exc_register(EXC_Sys, "syscall", true, + (iroutine_t) syscall_exception); +} + +/** @} + */ Index: kernel/arch/mips64/src/fpu_context.c =================================================================== --- kernel/arch/mips64/src/fpu_context.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/src/fpu_context.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,1 @@ +../../mips32/src/fpu_context.c Index: kernel/arch/mips64/src/interrupt.c =================================================================== --- kernel/arch/mips64/src/interrupt.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) +++ kernel/arch/mips64/src/interrupt.c (revision f51f1938507c8e76d8166e8355d3d1d892c9dae0) @@ -0,0 +1,189 @@ +/* + * Copyright (c) 2003-2004 Jakub Jermar + * 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 mips64 + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include