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

Timestamp:

2024-10-13T08:23:40Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (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.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

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)