diff --git a/src/kernel/core/arch/mips/arch_cpu.c b/src/kernel/core/arch/mips/arch_cpu.c index 5259c43903..1a2ebc0ad3 100755 --- a/src/kernel/core/arch/mips/arch_cpu.c +++ b/src/kernel/core/arch/mips/arch_cpu.c @@ -2,17 +2,28 @@ ** Copyright 2001, Travis Geiselbrecht. All rights reserved. ** Distributed under the terms of the NewOS License. */ + #include #include #include -int arch_cpu_init(kernel_args *ka) + +int +arch_cpu_init(kernel_args *ka) { return 0; } -int arch_cpu_init2(kernel_args *ka) + +int +arch_cpu_init2(kernel_args *ka) { return 0; } + +void +arch_cpu_idle(void) +{ +} + diff --git a/src/kernel/core/arch/ppc/arch_cpu.c b/src/kernel/core/arch/ppc/arch_cpu.c index d852350135..3838611f80 100755 --- a/src/kernel/core/arch/ppc/arch_cpu.c +++ b/src/kernel/core/arch/ppc/arch_cpu.c @@ -2,45 +2,60 @@ ** Copyright 2001, Travis Geiselbrecht. All rights reserved. ** Distributed under the terms of the NewOS License. */ + #include #include #include -int arch_cpu_init(kernel_args *ka) + +int +arch_cpu_init(kernel_args *ka) { return 0; } -int arch_cpu_init2(kernel_args *ka) + +int +arch_cpu_init2(kernel_args *ka) { return 0; } -void arch_cpu_invalidate_TLB_range(addr start, addr end) + +void +arch_cpu_invalidate_TLB_range(addr start, addr end) { } -void arch_cpu_invalidate_TLB_list(addr pages[], int num_pages) + +void +arch_cpu_invalidate_TLB_list(addr pages[], int num_pages) { } -void arch_cpu_global_TLB_invalidate(void) + +void +arch_cpu_global_TLB_invalidate(void) { } -long long system_time(void) + +long long +system_time(void) { return 0; } -int arch_cpu_user_memcpy(void *to, const void *from, size_t size, addr *fault_handler) + +int +arch_cpu_user_memcpy(void *to, const void *from, size_t size, addr *fault_handler) { char *tmp = (char *)to; char *s = (char *)from; *fault_handler = (addr)&&error; - while(size--) + while (size--) *tmp++ = *s++; *fault_handler = 0; @@ -51,11 +66,13 @@ error: return ERR_VM_BAD_USER_MEMORY; } -int arch_cpu_user_strcpy(char *to, const char *from, addr *fault_handler) + +int +arch_cpu_user_strcpy(char *to, const char *from, addr *fault_handler) { *fault_handler = (addr)&&error; - while((*to++ = *from++) != '\0') + while ((*to++ = *from++) != '\0') ; *fault_handler = 0; @@ -66,11 +83,13 @@ error: return ERR_VM_BAD_USER_MEMORY; } -int arch_cpu_user_strncpy(char *to, const char *from, size_t size, addr *fault_handler) + +int +arch_cpu_user_strncpy(char *to, const char *from, size_t size, addr *fault_handler) { *fault_handler = (addr)&&error; - while(size-- && (*to++ = *from++) != '\0') + while (size-- && (*to++ = *from++) != '\0') ; *fault_handler = 0; @@ -81,7 +100,9 @@ error: return ERR_VM_BAD_USER_MEMORY; } -int arch_cpu_user_memset(void *s, char c, size_t count, addr *fault_handler) + +int +arch_cpu_user_memset(void *s, char c, size_t count, addr *fault_handler) { char *xs = (char *) s; @@ -99,3 +120,7 @@ error: } +void +arch_cpu_idle(void) +{ +} diff --git a/src/kernel/core/arch/sh4/arch_cpu.c b/src/kernel/core/arch/sh4/arch_cpu.c index 990b76867d..3f56e7b497 100755 --- a/src/kernel/core/arch/sh4/arch_cpu.c +++ b/src/kernel/core/arch/sh4/arch_cpu.c @@ -2,6 +2,7 @@ ** Copyright 2001, Travis Geiselbrecht. All rights reserved. ** Distributed under the terms of the NewOS License. */ + #include #include #include @@ -9,12 +10,16 @@ static vcpu_struct *vcpu; -int arch_cpu_preboot_init(kernel_args *ka) + +int +arch_cpu_preboot_init(kernel_args *ka) { return 0; } -int arch_cpu_init(kernel_args *ka) + +int +arch_cpu_init(kernel_args *ka) { vcpu = ka->arch_args.vcpu; @@ -24,18 +29,24 @@ int arch_cpu_init(kernel_args *ka) return 0; } -int arch_cpu_init2(kernel_args *ka) + +int +arch_cpu_init2(kernel_args *ka) { return 0; } -void sh4_set_kstack(addr kstack) + +void +sh4_set_kstack(addr kstack) { // dprintf("sh4_set_kstack: setting kstack to 0x%x\n", kstack); vcpu->kstack = (unsigned int *)kstack; } -void sh4_set_user_pgdir(addr pgdir) + +void +sh4_set_user_pgdir(addr pgdir) { // dprintf("sh4_set_user_pgdir: setting pgdir to 0x%x\n", pgdir); if((addr)vcpu->user_pgdir != pgdir) @@ -43,7 +54,9 @@ void sh4_set_user_pgdir(addr pgdir) vcpu->user_pgdir = (unsigned int *)pgdir; } -void sh4_invl_page(addr va) + +void +sh4_invl_page(addr va) { int state; int i; @@ -69,14 +82,18 @@ void sh4_invl_page(addr va) int_restore_interrupts(state); } -void arch_cpu_invalidate_TLB_range(addr start, addr end) + +void +arch_cpu_invalidate_TLB_range(addr start, addr end) { for(; start < end; start += PAGE_SIZE) { sh4_invl_page(start); } } -void arch_cpu_invalidate_TLB_list(addr pages[], int num_pages) + +void +arch_cpu_invalidate_TLB_list(addr pages[], int num_pages) { int i; for(i=0; i #include #include @@ -21,20 +22,26 @@ static int *tss_loaded; static unsigned int *gdt = 0; -int arch_cpu_preboot_init(kernel_args *ka) + +int +arch_cpu_preboot_init(kernel_args *ka) { write_dr3(0); return 0; } -int arch_cpu_init(kernel_args *ka) + +int +arch_cpu_init(kernel_args *ka) { setup_system_time(ka->arch_args.system_time_cv_factor); return 0; } -int arch_cpu_init2(kernel_args *ka) + +int +arch_cpu_init2(kernel_args *ka) { region_id rid; struct tss_descriptor *tss_d; @@ -46,13 +53,13 @@ int arch_cpu_init2(kernel_args *ka) REGION_ADDR_EXACT_ADDRESS, PAGE_SIZE, REGION_WIRING_WIRED_ALREADY, LOCK_RW|LOCK_KERNEL); tss = kmalloc(sizeof(struct tss *) * ka->num_cpus); - if(tss == NULL) { + if (tss == NULL) { panic("arch_cpu_init2: could not allocate buffer for tss pointers\n"); return ENOMEM; } tss_loaded = kmalloc(sizeof(int) * ka->num_cpus); - if(tss == NULL) { + if (tss == NULL) { panic("arch_cpu_init2: could not allocate buffer for tss booleans\n"); return ENOMEM; } @@ -91,12 +98,14 @@ int arch_cpu_init2(kernel_args *ka) return 0; } -void i386_set_kstack(addr kstack) + +void +i386_set_kstack(addr kstack) { int curr_cpu = smp_get_current_cpu(); // dprintf("i386_set_kstack: kstack 0x%x, cpu %d\n", kstack, curr_cpu); - if(tss_loaded[curr_cpu] == 0) { + if (tss_loaded[curr_cpu] == 0) { short seg = (0x28 + 8*curr_cpu); asm("movw %0, %%ax;" "ltr %%ax;" : : "r" (seg) : "eax"); @@ -107,29 +116,35 @@ void i386_set_kstack(addr kstack) // dprintf("done\n"); } -void arch_cpu_invalidate_TLB_range(addr start, addr end) + +void +arch_cpu_invalidate_TLB_range(addr start, addr end) { - for(; start < end; start += PAGE_SIZE) { + for (; start < end; start += PAGE_SIZE) { invalidate_TLB(start); } } -void arch_cpu_invalidate_TLB_list(addr pages[], int num_pages) + +void +arch_cpu_invalidate_TLB_list(addr pages[], int num_pages) { int i; - for(i=0; i