Changeset 04803bf in mainline for uspace/lib/c/arch/ia32/src

Timestamp:

2011-03-21T22:00:17Z (14 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).

Location:

uspace/lib/c/arch/ia32/src

Files:

• entry.s (moved) (moved from uspace/lib/libc/arch/ia32/src/entry.s ) (3 diffs)
• fibril.S (moved) (moved from uspace/lib/libc/arch/ia32/src/fibril.S )
• setjmp.S (moved) (moved from uspace/lib/libc/arch/ia32/src/setjmp.S )
• stacktrace.c (added)
• stacktrace_asm.S (added)
• syscall.S (moved) (moved from uspace/lib/libc/arch/ia32/src/syscall.S ) (4 diffs)
• thread_entry.s (moved) (moved from uspace/lib/libc/arch/ia32/src/thread_entry.s ) (1 diff)
• tls.c (moved) (moved from uspace/lib/libc/arch/ia32/src/tls.c )

uspace/lib/c/arch/ia32/src/entry.s

@@ -27 +27 @@
 #
 
+INTEL_CPUID_STANDARD = 1
+INTEL_SEP = 11
+
 .section .init, "ax"
 
@@ -35 +38 @@
 ## User-space task entry point
 #
-# %ebx contains the PCB pointer
+# %edi contains the PCB pointer
 #
 __entry:
@@ -43 +46 @@
         mov %ax, %fs
         # Do not set %gs, it contains descriptor that can see TLS
-
+        
+        # Detect the mechanism used for making syscalls
+        movl $(INTEL_CPUID_STANDARD), %eax
+        cpuid
+        bt $(INTEL_SEP), %edx
+        jnc 0f
+        leal __syscall_fast_func, %eax
+        movl $__syscall_fast, (%eax)
+0:
+        #
+        # Create the first stack frame.
+        #
+        pushl $0
+        movl %esp, %ebp
+        
         # Pass the PCB pointer to __main as the first argument
-        pushl %ebx
+        pushl %edi
         call __main
-
-        call __exit

uspace/lib/c/arch/ia32/src/syscall.S

@@ -27 +27 @@
 #
 
+.data
+
+.global __syscall_fast_func
+__syscall_fast_func:
+        .long __syscall_slow
+
 .text
 
@@ -35 +41 @@
  * could benefit from this and not save unused registers on the stack.
  */
-.global __syscall_int
-__syscall_int:
+.global __syscall_slow
+__syscall_slow:
         pushl %ebx
         pushl %esi
@@ -64 +70 @@
  * segment, otherwise the SYSENTER wouldn't work in the first place).
  */
-.global __syscall_sysenter
-        .type __syscall_sysenter, @function
+.global __syscall_fast
+        .type __syscall_fast, @function
 
-__syscall_sysenter:
+__syscall_fast:
         pushl %ebx
         pushl %esi
@@ -92 +98 @@
         ret
 
-        .size __syscall_sysenter, . - __syscall_sysenter
+        .size __syscall_fast, . - __syscall_fast

uspace/lib/c/arch/ia32/src/thread_entry.s

@@ -42 +42 @@
 
         #
+        # Create the first stack frame.
+        #
+        pushl $0
+        mov %esp, %ebp
+
+        #
         # EAX contains address of uarg.
         #