Index: uspace/lib/c/arch/ia64/Makefile.inc =================================================================== --- uspace/lib/c/arch/ia64/Makefile.inc (revision 054476d01aca9bd28135fce64c7c46d84fe7398c) +++ uspace/lib/c/arch/ia64/Makefile.inc (revision 27f67f53b292b6b11b45be192ec9f6146a87fd85) @@ -28,7 +28,7 @@ ARCH_SOURCES = \ - arch/$(UARCH)/src/entry.s \ - arch/$(UARCH)/src/entryjmp.s \ - arch/$(UARCH)/src/thread_entry.s \ + arch/$(UARCH)/src/entry.S \ + arch/$(UARCH)/src/entryjmp.S \ + arch/$(UARCH)/src/thread_entry.S \ arch/$(UARCH)/src/syscall.S \ arch/$(UARCH)/src/fibril.S \ Index: uspace/lib/c/arch/ia64/src/entry.S =================================================================== --- uspace/lib/c/arch/ia64/src/entry.S (revision 27f67f53b292b6b11b45be192ec9f6146a87fd85) +++ uspace/lib/c/arch/ia64/src/entry.S (revision 27f67f53b292b6b11b45be192ec9f6146a87fd85) @@ -0,0 +1,46 @@ +# +# 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. +# + +#include + +.section .init, "ax" + +.org 0 + +## User-space task entry point +# +# r2 contains the PCB pointer +# +SYMBOL(__entry) + alloc loc0 = ar.pfs, 0, 1, 2, 0 + movl gp = __gp + + # Pass PCB pointer as the first argument to __main + mov out0 = r2 + br.call.sptk.many b0 = __main + Index: uspace/lib/c/arch/ia64/src/entry.s =================================================================== --- uspace/lib/c/arch/ia64/src/entry.s (revision 054476d01aca9bd28135fce64c7c46d84fe7398c) +++ (revision ) @@ -1,45 +1,0 @@ -# -# 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. -# - -.section .init, "ax" - -.org 0 - -.globl __entry - -## User-space task entry point -# -# r2 contains the PCB pointer -# -__entry: - alloc loc0 = ar.pfs, 0, 1, 2, 0 - movl gp = __gp - - # Pass PCB pointer as the first argument to __main - mov out0 = r2 - br.call.sptk.many b0 = __main Index: uspace/lib/c/arch/ia64/src/entryjmp.S =================================================================== --- uspace/lib/c/arch/ia64/src/entryjmp.S (revision 27f67f53b292b6b11b45be192ec9f6146a87fd85) +++ uspace/lib/c/arch/ia64/src/entryjmp.S (revision 27f67f53b292b6b11b45be192ec9f6146a87fd85) @@ -0,0 +1,45 @@ +# +# Copyright (c) 2008 Jiri Svoboda +# 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 +.explicit + +## void entry_point_jmp(void *entry_point, void *pcb); +# +# in0 (r32) contains entry_point +# in1 (r33) contains pcb +# +# Jump to program entry point +SYMBOL(entry_point_jmp) + # Pass pcb to the entry point in r2 + + mov b6 = r32 + mov r2 = r33 ;; + br b6 ;; Index: uspace/lib/c/arch/ia64/src/entryjmp.s =================================================================== --- uspace/lib/c/arch/ia64/src/entryjmp.s (revision 054476d01aca9bd28135fce64c7c46d84fe7398c) +++ (revision ) @@ -1,44 +1,0 @@ -# -# Copyright (c) 2008 Jiri Svoboda -# 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. -# - -.text -.explicit -.globl entry_point_jmp - -## void entry_point_jmp(void *entry_point, void *pcb); -# -# in0 (r32) contains entry_point -# in1 (r33) contains pcb -# -# Jump to program entry point -entry_point_jmp: - # Pass pcb to the entry point in r2 - - mov b6 = r32 - mov r2 = r33 ;; - br b6 ;; Index: uspace/lib/c/arch/ia64/src/fibril.S =================================================================== --- uspace/lib/c/arch/ia64/src/fibril.S (revision 054476d01aca9bd28135fce64c7c46d84fe7398c) +++ uspace/lib/c/arch/ia64/src/fibril.S (revision 27f67f53b292b6b11b45be192ec9f6146a87fd85) @@ -27,12 +27,10 @@ # +#include #include .text -.global context_save -.global context_restore - -context_save: +FUNCTION_BEGIN(context_save) alloc loc0 = ar.pfs, 1, 49, 0, 0 mov loc1 = ar.unat ;; @@ -182,6 +180,7 @@ add r8 = r0, r0, 1 /* context_save returns 1 */ br.ret.sptk.many b0 - -context_restore: +FUNCTION_END(context_save) + +FUNCTION_BEGIN(context_restore) alloc loc0 = ar.pfs, 1, 50, 0, 0 ;; @@ -338,2 +337,4 @@ mov r8 = r0 /* context_restore returns 0 */ br.ret.sptk.many b0 +FUNCTION_END(context_restore) + Index: uspace/lib/c/arch/ia64/src/stacktrace_asm.S =================================================================== --- uspace/lib/c/arch/ia64/src/stacktrace_asm.S (revision 054476d01aca9bd28135fce64c7c46d84fe7398c) +++ uspace/lib/c/arch/ia64/src/stacktrace_asm.S (revision 27f67f53b292b6b11b45be192ec9f6146a87fd85) @@ -27,15 +27,17 @@ # +#include + .text -.global stacktrace_prepare -.global stacktrace_fp_get -.global stacktrace_pc_get +FUNCTION_BEGIN(stacktrace_prepare) + br.ret.sptk.many b0 +FUNCTION_END(stacktrace_prepare) -stacktrace_prepare: - br.ret.sptk.many b0 - -stacktrace_fp_get: -stacktrace_pc_get: +FUNCTION_BEGIN(stacktrace_fp_get) +FUNCTION_BEGIN(stacktrace_pc_get) mov r8 = r0 br.ret.sptk.many b0 +FUNCTION_END(stacktrace_fp_get) +FUNCTION_END(stacktrace_pc_get) + Index: uspace/lib/c/arch/ia64/src/syscall.S =================================================================== --- uspace/lib/c/arch/ia64/src/syscall.S (revision 054476d01aca9bd28135fce64c7c46d84fe7398c) +++ uspace/lib/c/arch/ia64/src/syscall.S (revision 27f67f53b292b6b11b45be192ec9f6146a87fd85) @@ -27,4 +27,6 @@ # +#include + /** * Immediate operand for break instruction. @@ -37,8 +39,9 @@ #define SYSCALL_IMM 1 -.global __syscall -__syscall: +FUNCTION_BEGIN(__syscall) alloc r14 = ar.pfs, 7, 0, 0, 0 ;; break SYSCALL_IMM mov ar.pfs = r14 ;; br.ret.sptk.many b0 +FUNCTION_END(__syscall) + Index: uspace/lib/c/arch/ia64/src/thread_entry.S =================================================================== --- uspace/lib/c/arch/ia64/src/thread_entry.S (revision 27f67f53b292b6b11b45be192ec9f6146a87fd85) +++ uspace/lib/c/arch/ia64/src/thread_entry.S (revision 27f67f53b292b6b11b45be192ec9f6146a87fd85) @@ -0,0 +1,51 @@ +# +# 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. +# + +#include + +.text + +## User-space thread entry point for all but the first threads. +# +# +SYMBOL(__thread_entry) + alloc loc0 = ar.pfs, 0, 1, 1, 0 + + movl gp = __gp + + # + # r8 contains address of uarg structure. + # + + mov out0 = r8 + br.call.sptk.many b0 = __thread_main + + # + # Not reached. + # + Index: uspace/lib/c/arch/ia64/src/thread_entry.s =================================================================== --- uspace/lib/c/arch/ia64/src/thread_entry.s (revision 054476d01aca9bd28135fce64c7c46d84fe7398c) +++ (revision ) @@ -1,52 +1,0 @@ -# -# 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. -# - -.text - -.globl __thread_entry - -## User-space thread entry point for all but the first threads. -# -# -__thread_entry: - alloc loc0 = ar.pfs, 0, 1, 1, 0 - - movl gp = __gp - - # - # r8 contains address of uarg structure. - # - - mov out0 = r8 - br.call.sptk.many b0 = __thread_main - - # - # Not reached. - # - -.end __thread_entry