projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.26.21: fix ERROR leaking memory
[sbcl.git]
/
src
/
runtime
/
x86-64-assem.S
diff --git
a/src/runtime/x86-64-assem.S
b/src/runtime/x86-64-assem.S
index
af5db22
..
1b4ac54
100644
(file)
--- a/
src/runtime/x86-64-assem.S
+++ b/
src/runtime/x86-64-assem.S
@@
-25,15
+25,15
@@
#include "genesis/thread.h"
/* Minimize conditionalization for different OS naming schemes. */
#include "genesis/thread.h"
/* Minimize conditionalization for different OS naming schemes. */
-#if defined __linux__ || defined __FreeBSD__ /* (but *not* OpenBSD) */
+#if defined __linux__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __sun
#define GNAME(var) var
#else
#define GNAME(var) _##var
#endif
#define GNAME(var) var
#else
#define GNAME(var) _##var
#endif
-/* Get the right type of alignment. Linux and FreeBSD (but not OpenBSD)
+/* Get the right type of alignment. Linux, FreeBSD and OpenBSD
* want alignment in bytes. */
* want alignment in bytes. */
-#if defined(__linux__) || defined(__FreeBSD__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun)
#define align_4byte 4
#define align_8byte 8
#define align_16byte 16
#define align_4byte 4
#define align_8byte 8
#define align_16byte 16
@@
-128,8
+128,7
@@
GNAME(call_into_c):
.globl GNAME(call_into_lisp_first_time)
TYPE(GNAME(call_into_lisp_first_time))
.globl GNAME(call_into_lisp_first_time)
TYPE(GNAME(call_into_lisp_first_time))
-/* The *ALIEN-STACK* pointer is set up on the first call_into_lisp when
- * the stack changes. We don't worry too much about saving registers
+/* We don't worry too much about saving registers
* here, because we never expect to return from the initial call to lisp
* anyway */
* here, because we never expect to return from the initial call to lisp
* anyway */
@@
-137,7
+136,6
@@
GNAME(call_into_c):
GNAME(call_into_lisp_first_time):
push %rbp # Save old frame pointer.
mov %rsp,%rbp # Establish new frame.
GNAME(call_into_lisp_first_time):
push %rbp # Save old frame pointer.
mov %rsp,%rbp # Establish new frame.
- mov %rsp,ALIEN_STACK + SYMBOL_VALUE_OFFSET
#if defined(LISP_FEATURE_DARWIN)
movq GSYM(GNAME(all_threads)),%rax
#else
#if defined(LISP_FEATURE_DARWIN)
movq GSYM(GNAME(all_threads)),%rax
#else
@@
-246,19
+244,17
@@
LsingleValue:
.text
.globl GNAME(fpu_save)
TYPE(GNAME(fpu_save))
.text
.globl GNAME(fpu_save)
TYPE(GNAME(fpu_save))
- .align 2,0x90
+ .align align_16byte,0x90
GNAME(fpu_save):
GNAME(fpu_save):
- mov 4(%rsp),%rax
- fnsave (%rax) # Save the NPX state. (resets NPX)
+ fnsave (%rdi) # Save the NPX state. (resets NPX)
ret
SIZE(GNAME(fpu_save))
.globl GNAME(fpu_restore)
TYPE(GNAME(fpu_restore))
ret
SIZE(GNAME(fpu_save))
.globl GNAME(fpu_restore)
TYPE(GNAME(fpu_restore))
- .align 2,0x90
+ .align align_16byte,0x90
GNAME(fpu_restore):
GNAME(fpu_restore):
- mov 4(%rsp),%rax
- frstor (%rax) # Restore the NPX state.
+ frstor (%rdi) # Restore the NPX state.
ret
SIZE(GNAME(fpu_restore))
\f
ret
SIZE(GNAME(fpu_restore))
\f
@@
-369,6
+365,7
@@
GNAME(fun_end_breakpoint_guts):
multiple_value_return:
.globl GNAME(fun_end_breakpoint_trap)
multiple_value_return:
.globl GNAME(fun_end_breakpoint_trap)
+ .align align_16byte,0x90
GNAME(fun_end_breakpoint_trap):
TRAP
.byte trap_FunEndBreakpoint
GNAME(fun_end_breakpoint_trap):
TRAP
.byte trap_FunEndBreakpoint