Changeset 4a8ed8a in mainline

Timestamp:

2006-03-09T12:38:00Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0ef54d3

Parents:

fbd6f81

Message:

ia64 work.
Changes to make userspace work (uspace part).

Location:

libc/arch/ia64

Files:

• _link.ld.in (modified) (1 diff)
• src/entry.s (modified) (1 diff)
• src/syscall.c (modified) (2 diffs)

libc/arch/ia64/_link.ld.in

@@ -4 +4 @@
 
 SECTIONS {
-        .text 0x00004000 : {
+        .text 0x00010000 : {
                 *(.text)
                 *(.rodata .rodata.*)

libc/arch/ia64/src/entry.s

@@ -37 +37 @@
 #
 __entry:
-        br.call.sptk.many b0 = main
-        br.call.sptk.many b0 = __exit
+        mov r1 = __entry
+        { br.call.sptk.many b0 = main }
+        { br.call.sptk.many b0 = __exit }
         
 .end __entry

libc/arch/ia64/src/syscall.c

@@ -29 +29 @@
 #include <libc.h>
 
+/**
+ * Immediate operand for break instruction.
+ * Be carefull about the value as Ski simulator
+ * is somewhat sensitive to its value.
+ *
+ * 0 will be confused with Ski breakpoint.
+ * And higher values will be confused with SSC's.
+ */
+#define SYSCALL_IMM     1
+
 sysarg_t __syscall(const syscall_t id, const sysarg_t p1, const sysarg_t p2, const sysarg_t p3)
 {
@@ -38 +48 @@
                 "mov r16 = %3\n"
                 "mov r17 = %4\n"
-                "break 0\n"
+                "break %5\n"
                 "mov %0 = r8\n"
                 : "=r" (ret)
-                : "r" (id), "r" (p1), "r" (p2), "r" (p3)
+                : "r" (id), "r" (p1), "r" (p2), "r" (p3), "i" (SYSCALL_IMM)
                 : "r8", "r14", "r15", "r16"
         );