Changeset 04803bf in mainline for uspace/lib/c/arch/amd64/src/fibril.S

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes (needs fixes).

File:

• uspace/lib/c/arch/amd64/src/fibril.S (moved) (moved from uspace/lib/libc/arch/amd64/src/fibril.S ) (2 diffs)

uspace/lib/c/arch/amd64/src/fibril.S

@@ -49 +49 @@
         movq %rax, OFFSET_TLS(%rdi)
                 
-        xorq %rax,%rax          # context_save returns 1
-        incq %rax
+        xorl %eax, %eax         # context_save returns 1
+        incl %eax
         ret
 
@@ -67 +67 @@
         # Set thread local storage
         movq OFFSET_TLS(%rdi), %rdi   # Set arg1 to TLS addr
-        movq $1, %rax           # SYS_TLS_SET
+        movl $1, %eax           # SYS_TLS_SET
         syscall
 
-        xorq %rax,%rax          # context_restore returns 0
+        xorl %eax, %eax         # context_restore returns 0
         ret