From: ryuz Date: Thu, 1 May 2008 15:48:07 +0000 (+0000) Subject: (none) X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0c863dff13e1ec504bc55559fa088d09f07dda35;p=hos%2Fhos-v4a.git (none) --- diff --git a/kernel/source/arch/proc/ia32/i386/gcc/kcre_ctx.S b/kernel/source/arch/proc/ia32/i386/gcc/kcre_ctx.S index fb652eb..a9eaf85 100755 --- a/kernel/source/arch/proc/ia32/i386/gcc/kcre_ctx.S +++ b/kernel/source/arch/proc/ia32/i386/gcc/kcre_ctx.S @@ -19,8 +19,8 @@ VP_INT par1, 16(%esp) : 実行時パラメータ1 VP_INT par2) 20(%esp) : 実行時パラメータ2 ************************************************/ - .global _kernel_cre_ctx -_kernel_cre_ctx: + .global __kernel_cre_ctx +__kernel_cre_ctx: movl 8(%esp), %eax /* スタックを取り出し */ subl 20, %eax movl ctx_entry, %ebx /* リターンアドレス */ diff --git a/kernel/source/arch/proc/ia32/i386/gcc/kdis_int.S b/kernel/source/arch/proc/ia32/i386/gcc/kdis_int.S index 1a72ab2..b07ac21 100755 --- a/kernel/source/arch/proc/ia32/i386/gcc/kdis_int.S +++ b/kernel/source/arch/proc/ia32/i386/gcc/kdis_int.S @@ -15,8 +15,8 @@ 割り込み禁止 void _kernel_dis_int(void) ************************************************/ - .global _kernel_dis_int -_kernel_dis_int: + .global __kernel_dis_int +__kernel_dis_int: cli /* 割込み禁止 */ ret diff --git a/kernel/source/arch/proc/ia32/i386/gcc/kena_int.S b/kernel/source/arch/proc/ia32/i386/gcc/kena_int.S index ccc4d46..20994fc 100755 --- a/kernel/source/arch/proc/ia32/i386/gcc/kena_int.S +++ b/kernel/source/arch/proc/ia32/i386/gcc/kena_int.S @@ -15,8 +15,8 @@ 割り込み許可 void _kernel_ena_int(void) ************************************************/ - .global _kernel_ena_int -_kernel_ena_int: + .global __kernel_ena_int +__kernel_ena_int: sti /* 割込み許可 */ ret diff --git a/kernel/source/arch/proc/ia32/i386/gcc/krst_ctx.S b/kernel/source/arch/proc/ia32/i386/gcc/krst_ctx.S index e1f11a5..f192fe1 100755 --- a/kernel/source/arch/proc/ia32/i386/gcc/krst_ctx.S +++ b/kernel/source/arch/proc/ia32/i386/gcc/krst_ctx.S @@ -18,8 +18,8 @@ FP entry, 12(%esp) : 実行アドレス VP isp) 16(%esp) : スタックポインタ ************************************************/ - .global _kernel_rst_ctx -_kernel_rst_ctx: + .global __kernel_rst_ctx +__kernel_rst_ctx: mov 4(%esp), %eax mov 8(%esp), %ebx mov 12(%esp), %ecx diff --git a/kernel/source/arch/proc/ia32/i386/gcc/ksta_ctx.S b/kernel/source/arch/proc/ia32/i386/gcc/ksta_ctx.S index 0c9f7ec..e464a31 100755 --- a/kernel/source/arch/proc/ia32/i386/gcc/ksta_ctx.S +++ b/kernel/source/arch/proc/ia32/i386/gcc/ksta_ctx.S @@ -16,8 +16,8 @@ void _kernel_sta_ctx( _KERNEL_T_CTXCB *pk_ctxcb) 4(%esp) : 現在のコンテキストの保存先 ************************************************/ - .global _kernel_sta_ctx -_kernel_sta_ctx: + .global __kernel_sta_ctx +__kernel_sta_ctx: movl 4(%esp), %eax popl %ebp popl %edi diff --git a/kernel/source/arch/proc/ia32/i386/gcc/kswi_ctx.S b/kernel/source/arch/proc/ia32/i386/gcc/kswi_ctx.S index 9f18d4b..1ea716e 100755 --- a/kernel/source/arch/proc/ia32/i386/gcc/kswi_ctx.S +++ b/kernel/source/arch/proc/ia32/i386/gcc/kswi_ctx.S @@ -17,8 +17,8 @@ _KERNEL_T_CTXCB *pk_ctxinf_nxt, 4(%esp) : 現在のコンテキストの保存先 _KERNEL_T_CTXCB *pk_ctxinf_now) 8(%esp) : 切り替えるコンテキスト ************************************************/ - .global _kernel_swi_ctx -_kernel_swi_ctx: + .global __kernel_swi_ctx +__kernel_swi_ctx: movl 4(%esp), %eax movl 8(%esp), %ebx pushl %ebx diff --git a/kernel/source/arch/proc/ia32/i386/gcc/kwai_int.S b/kernel/source/arch/proc/ia32/i386/gcc/kwai_int.S index 8b8a6b7..007e8fa 100755 --- a/kernel/source/arch/proc/ia32/i386/gcc/kwai_int.S +++ b/kernel/source/arch/proc/ia32/i386/gcc/kwai_int.S @@ -14,10 +14,10 @@ 割り込み待ち(CPUのアイドル処理) void _kernel_wai_int(void); ************************************************/ - .global _kernel_wai_int -_kernel_wai_int: + .global __kernel_wai_int +__kernel_wai_int: hlt - jmp _kernel_wai_int + jmp __kernel_wai_int .end