Changeset 7bf29e5 in mainline for uspace/lib/c/arch/ia32/src/syscall.S

Timestamp:

2025-01-09T11:29:38Z (6 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

a5c2960e

Parents:

bc3d695 (diff), 4e1221c (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 'upstream/master' into helenraid-para

File:

• uspace/lib/c/arch/ia32/src/syscall.S (modified) (3 diffs)

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

@@ -77 +77 @@
         pushl %ebp
         mov %esp, %ebp
-        lea ra, %edi
         movl 20(%esp), %edx     # First argument.
         movl 24(%esp), %ecx     # Second argument.
@@ -83 +82 @@
         movl 32(%esp), %esi     # Fourth argument.
         movl 44(%esp), %eax     # Syscall number.
-        sysenter
-ra:
+        call 1f
         movw %cs, %cx
         addw $8, %cx
@@ -95 +93 @@
         popl %ebx
         ret
+
+        /* Trampoline for entering kernel */
+1:
+        pop %edi
+        sysenter
 FUNCTION_END(__syscall_fast)