oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel: compact utility functions

Browse Source
This commit is contained in:
Ben Gras 2012-05-31 01:25:31 +02:00
parent c2d5e01042
commit 1daf36038c
1 changed files with 74 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

198
kernel/arch/i386/klib.S
View File

@ -11,6 +11,53 @@
#include "sconst.h" #include "sconst.h"
#include <machine/multiboot.h> #include <machine/multiboot.h>
/* Easy way to make functions */
/* Make a function of the form func(arg) */
#define STACKARG 8(%ebp)
#define ARG_EAX_ACTION(FUNCTION, ACTION) ;\
ENTRY(FUNCTION) ;\
push %ebp ;\
mov %esp, %ebp ;\
mov STACKARG, %eax ;\
ACTION ;\
pop %ebp ;\
ret
/* Make a function of the form ret = func() */
#define ARG_EAX_RETURN(FUNCTION, EXPR) ;\
ENTRY(FUNCTION) ;\
push %ebp ;\
mov %esp, %ebp ;\
mov EXPR, %eax ;\
pop %ebp ;\
ret
/* Make a function of the form ret = func() */
#define ARG_EAX_SET(FUNCTION, DEST) ;\
ENTRY(FUNCTION) ;\
push %ebp ;\
mov %esp, %ebp ;\
mov STACKARG, %eax ;\
mov %eax, DEST ;\
jmp 0f /* a jump is required for some sets */ ;\
0: pop %ebp ;\
ret
/* Make a function of the form ret = func() */
#define ARG_AX_SET(FUNCTION, DEST) ;\
ENTRY(FUNCTION) ;\
push %ebp ;\
mov %esp, %ebp ;\
mov STACKARG, %eax ;\
mov %ax, DEST ;\
jmp 0f /* a jump is required for some sets */ ;\
0: pop %ebp ;\
ret
/* /*
* This file contains a number of assembly code utility routines needed by the * This file contains a number of assembly code utility routines needed by the
* kernel. * kernel.
@ -450,33 +497,6 @@ ENTRY(fnstsw)
fnstsw %ax fnstsw %ax
ret ret
/* store control word (non-waiting) */
ENTRY(fnstcw)
push %eax
mov 8(%esp), %eax
/* DO NOT CHANGE THE OPERAND!!! gas2ack does not handle it yet */
fnstcw (%eax)
pop %eax
ret
/*===========================================================================*/
/* fxsave */
/*===========================================================================*/
ENTRY(fxsave)
mov 4(%esp), %eax
fxsave (%eax) /* Do not change the operand! (gas2ack) */
ret
/*===========================================================================*/
/* fnsave */
/*===========================================================================*/
ENTRY(fnsave)
mov 4(%esp), %eax
fnsave (%eax) /* Do not change the operand! (gas2ack) */
fwait /* required for compatibility with processors prior pentium */
ret
/*===========================================================================*/ /*===========================================================================*/
/* fxrstor */ /* fxrstor */
/*===========================================================================*/ /*===========================================================================*/
@ -502,107 +522,37 @@ ENTRY(__frstor_failure)
mov $1, %eax mov $1, %eax
ret ret
/*===========================================================================*/ /* Read/write control registers */
/* read_cr0 */ ARG_EAX_RETURN(read_cr0, %cr0);
/*===========================================================================*/ ARG_EAX_RETURN(read_cr2, %cr2);
/* PUBLIC unsigned long read_cr0(void); */ ARG_EAX_RETURN(read_cr3, %cr3);
ENTRY(read_cr0) ARG_EAX_RETURN(read_cr4, %cr4);
push %ebp ARG_EAX_SET(write_cr4, %cr4);
mov %esp, %ebp ARG_EAX_SET(write_cr0, %cr0);
mov %cr0, %eax ARG_EAX_SET(write_cr3, %cr3);
pop %ebp
ret
/*===========================================================================*/ /* Read/write various descriptor tables */
/* write_cr0 */ ARG_EAX_ACTION(x86_ltr, ltr STACKARG );
/*===========================================================================*/ ARG_EAX_ACTION(x86_lidt, lidtl (%eax));
/* PUBLIC void write_cr0(unsigned long value); */ ARG_EAX_ACTION(x86_lgdt, lgdt (%eax));
ENTRY(write_cr0) ARG_EAX_ACTION(x86_lldt, lldt STACKARG);
push %ebp ARG_EAX_ACTION(x86_sgdt, sgdt (%eax));
mov %esp, %ebp ARG_EAX_ACTION(x86_sidt, sidt (%eax));
mov 8(%ebp), %eax
mov %eax, %cr0
jmp 0f /* A jump is required for some flags */
0:
pop %ebp
ret
/*===========================================================================*/ /* Load segments */
/* read_cr2 */ ARG_AX_SET(x86_load_ds, %ds)
/*===========================================================================*/ ARG_AX_SET(x86_load_es, %es)
/* PUBLIC reg_t read_cr2(void); */ ARG_AX_SET(x86_load_fs, %fs)
ENTRY(read_cr2) ARG_AX_SET(x86_load_gs, %gs)
mov %cr2, %eax ARG_AX_SET(x86_load_ss, %ss)
ret
/*===========================================================================*/ /* FPU */
/* read_cr3 */ ARG_EAX_ACTION(fnsave, fnsave (%eax) ; fwait);
/*===========================================================================*/ ARG_EAX_ACTION(fxsave, fxsave (%eax));
/* PUBLIC unsigned long read_cr3(void); */ ARG_EAX_ACTION(fnstcw, fnstcw (%eax));
ENTRY(read_cr3)
push %ebp
mov %esp, %ebp
/* DO NOT CHANGE THE OPERAND!!! gas2ack does not handle it yet */ /* invlpg */
mov %cr3, %eax ARG_EAX_ACTION(i386_invlpg, invlpg (%eax));
pop %ebp
ret
/*===========================================================================*/
/* read_cr4 */
/*===========================================================================*/
/* PUBLIC unsigned long read_cr4(void); */
ENTRY(read_cr4)
push %ebp
mov %esp, %ebp
/* DO NOT CHANGE THE OPERAND!!! gas2ack does not handle it yet */
mov %cr4, %eax
pop %ebp
ret
/*===========================================================================*/
/* write_cr4 */
/*===========================================================================*/
/* PUBLIC void write_cr4(unsigned long value); */
ENTRY(write_cr4)
push %ebp
mov %esp, %ebp
mov 8(%ebp), %eax
/* DO NOT CHANGE THE OPERAND!!! gas2ack does not handle it yet */
mov %eax, %cr4
jmp 0f
0:
pop %ebp
ret
/*===========================================================================*/
/* write_cr3 */
/*===========================================================================*/
/* PUBLIC void write_cr3(unsigned long value); */
ENTRY(write_cr3)
push %ebp
mov %esp, %ebp
mov 8(%ebp), %eax
/* DO NOT CHANGE THE OPERAND!!! gas2ack does not handle it yet */
mov %eax, %cr3
pop %ebp
ret
/*===========================================================================*/
/* i386_invlpg */
/*===========================================================================*/
/* PUBLIC void i386_invlpg(unsigned long linaddr); */
ENTRY(i386_invlpg)
push %ebp
mov %esp, %ebp
mov 8(%ebp), %eax
invlpg (%eax)
pop %ebp
ret
/*===========================================================================*/ /*===========================================================================*/
/* getcr3val */ /* getcr3val */