diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-07-21 23:12:54 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-07-21 23:12:54 +0000 |
| commit | 307140a2d82b32bf119934b5ea599573da77b4df (patch) | |
| tree | 0b477586fc32c4852edfeaafdd9caa0499eb2209 /usr/src | |
| parent | d1e9a943f54c1cb91f507cc05b2d9cac695b3f4f (diff) | |
| download | illumos-joyent-307140a2d82b32bf119934b5ea599573da77b4df.tar.gz | |
back out OS-3215: causes OS-3223
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/i86pc/ml/syscall_asm_amd64.s | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/usr/src/uts/i86pc/ml/syscall_asm_amd64.s b/usr/src/uts/i86pc/ml/syscall_asm_amd64.s index 2722561c38..fec8301bbc 100644 --- a/usr/src/uts/i86pc/ml/syscall_asm_amd64.s +++ b/usr/src/uts/i86pc/ml/syscall_asm_amd64.s @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2014, Joyent, Inc. All rights reserved. + * Copyright (c) 2012, Joyent, Inc. All rights reserved. */ #include <sys/asm_linkage.h> @@ -827,16 +827,12 @@ _syscall32_save: */ movq %rax, %rbx - movl 0x0(%rsp), %edi /* arg0 */ - movl 0x8(%rsp), %esi /* arg1 */ - movl 0x10(%rsp), %edx /* arg2 */ - movl 0x30(%rsp), %eax /* arg6 load */ - movl 0x18(%rsp), %ecx /* arg3 */ - movl %eax, 0x0(%rsp) /* arg6 saved to stack */ - movl 0x20(%rsp), %r8d /* arg4 */ - movl 0x38(%rsp), %eax /* arg7 load */ - movl 0x28(%rsp), %r9d /* arg5 */ - movl %eax, 0x8(%rsp) /* arg7 saved to stack */ + movl 0(%rsp), %edi + movl 8(%rsp), %esi + movl 0x10(%rsp), %edx + movl 0x18(%rsp), %ecx + movl 0x20(%rsp), %r8d + movl 0x28(%rsp), %r9d call *SY_CALLC(%rbx) @@ -1086,16 +1082,12 @@ sys_sysenter() * %rax contains the handler address. */ movq %rax, %rbx - movl 0x0(%rsp), %edi /* arg0 */ - movl 0x8(%rsp), %esi /* arg1 */ - movl 0x10(%rsp), %edx /* arg2 */ - movl 0x30(%rsp), %eax /* arg6 load */ - movl 0x18(%rsp), %ecx /* arg3 */ - movl %eax, 0x0(%rsp) /* arg6 saved to stack */ - movl 0x20(%rsp), %r8d /* arg4 */ - movl 0x38(%rsp), %eax /* arg7 load */ - movl 0x28(%rsp), %r9d /* arg5 */ - movl %eax, 0x8(%rsp) /* arg7 saved to stack */ + movl 0(%rsp), %edi + movl 8(%rsp), %esi + movl 0x10(%rsp), %edx + movl 0x18(%rsp), %ecx + movl 0x20(%rsp), %r8d + movl 0x28(%rsp), %r9d call *SY_CALLC(%rbx) |