Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some cleanups.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2317 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2002-12-30 11:17:36 +00:00
parent 381271419d
commit 2d4d170f83
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/kernel/core/arch/x86/arch_cpu.c
View File

@ -53,7 +53,7 @@ arch_cpu_init2(kernel_args *ka)
vm_create_anonymous_region(vm_get_kernel_aspace_id(), "gdt", (void **)&gdt, vm_create_anonymous_region(vm_get_kernel_aspace_id(), "gdt", (void **)&gdt,
REGION_ADDR_EXACT_ADDRESS, PAGE_SIZE, REGION_WIRING_WIRED_ALREADY, LOCK_RW|LOCK_KERNEL); REGION_ADDR_EXACT_ADDRESS, PAGE_SIZE, REGION_WIRING_WIRED_ALREADY, LOCK_RW|LOCK_KERNEL);
i386_selector_init( gdt ); // pass the new gdt i386_selector_init(gdt); // pass the new gdt
tss = malloc(sizeof(struct tss *) * ka->num_cpus); tss = malloc(sizeof(struct tss *) * ka->num_cpus);
if (tss == NULL) { if (tss == NULL) {
@ -68,13 +68,13 @@ arch_cpu_init2(kernel_args *ka)
} }
memset(tss_loaded, 0, sizeof(int) * ka->num_cpus); memset(tss_loaded, 0, sizeof(int) * ka->num_cpus);
for(i=0; i<ka->num_cpus; i++) { for (i = 0; i < ka->num_cpus; i++) {
char tss_name[16]; char tss_name[16];
sprintf(tss_name, "tss%d", i); sprintf(tss_name, "tss%d", i);
rid = vm_create_anonymous_region(vm_get_kernel_aspace_id(), tss_name, (void **)&tss[i], rid = vm_create_anonymous_region(vm_get_kernel_aspace_id(), tss_name, (void **)&tss[i],
REGION_ADDR_ANY_ADDRESS, PAGE_SIZE, REGION_WIRING_WIRED, LOCK_RW|LOCK_KERNEL); REGION_ADDR_ANY_ADDRESS, PAGE_SIZE, REGION_WIRING_WIRED, LOCK_RW|LOCK_KERNEL);
if(rid < 0) { if (rid < 0) {
panic("arch_cpu_init2: unable to create region for tss\n"); panic("arch_cpu_init2: unable to create region for tss\n");
return ENOMEM; return ENOMEM;
} }
@ -124,7 +124,7 @@ void
arch_cpu_invalidate_TLB_range(addr start, addr end) arch_cpu_invalidate_TLB_range(addr start, addr end)
{ {
int num_pages = end/PAGE_SIZE - start/PAGE_SIZE; int num_pages = end/PAGE_SIZE - start/PAGE_SIZE;
while ( num_pages-- >= 0 ) { while (num_pages-- >= 0) {
invalidate_TLB(start); invalidate_TLB(start);
start += PAGE_SIZE; start += PAGE_SIZE;
} }
@ -153,11 +153,11 @@ arch_cpu_user_memcpy(void *to, const void *from, size_t size, addr *fault_handle
*tmp++ = *s++; *tmp++ = *s++;
*fault_handler = 0; *fault_handler = 0;
return 0; return 0;
error: error:
*fault_handler = 0; *fault_handler = 0;
return ERR_VM_BAD_USER_MEMORY; return B_BAD_ADDRESS;
} }
@ -170,11 +170,11 @@ arch_cpu_user_strcpy(char *to, const char *from, addr *fault_handler)
; ;
*fault_handler = 0; *fault_handler = 0;
return 0; return 0;
error: error:
*fault_handler = 0; *fault_handler = 0;
return ERR_VM_BAD_USER_MEMORY; return B_BAD_ADDRESS;
} }
@ -187,11 +187,11 @@ arch_cpu_user_strncpy(char *to, const char *from, size_t size, addr *fault_handl
; ;
*fault_handler = 0; *fault_handler = 0;
return 0; return 0;
error: error:
*fault_handler = 0; *fault_handler = 0;
return ERR_VM_BAD_USER_MEMORY; return B_BAD_ADDRESS;
} }
@ -209,14 +209,14 @@ arch_cpu_user_strlcpy(char *to, const char *from, size_t size, addr *faultHandle
error: error:
*faultHandler = 0; *faultHandler = 0;
return ERR_VM_BAD_USER_MEMORY; return B_BAD_ADDRESS;
} }
int int
arch_cpu_user_memset(void *s, char c, size_t count, addr *fault_handler) arch_cpu_user_memset(void *s, char c, size_t count, addr *fault_handler)
{ {
char *xs = (char *) s; char *xs = (char *)s;
*fault_handler = (addr)&&error; *fault_handler = (addr)&&error;
@ -224,11 +224,11 @@ arch_cpu_user_memset(void *s, char c, size_t count, addr *fault_handler)
*xs++ = c; *xs++ = c;
*fault_handler = 0; *fault_handler = 0;
return 0; return 0;
error: error:
*fault_handler = 0; *fault_handler = 0;
return ERR_VM_BAD_USER_MEMORY; return B_BAD_ADDRESS;
} }