From 760ca9101a2615613b071444ee370e0f2d93fba3 Mon Sep 17 00:00:00 2001 From: Cyrus Harmon Date: Wed, 15 Mar 2006 05:39:53 +0000 Subject: [PATCH] 0.9.10.35 Removing DOLLARLITERAL and GNAMEDOLLAR macro cruft from x86-assem.S. Add generated {x86,ppc}-darwin files to src/runtime/.cvsignore. --- src/runtime/.cvsignore | 6 ++++++ src/runtime/x86-assem.S | 22 +++++----------------- version.lisp-expr | 2 +- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/runtime/.cvsignore b/src/runtime/.cvsignore index 4c7c2f5..a820390 100644 --- a/src/runtime/.cvsignore +++ b/src/runtime/.cvsignore @@ -8,3 +8,9 @@ sbcl.h sbcl.nm sparc-funcdef.h trymap +ppc-darwin-link-flags +ppc-darwin-fix-rospace +ppc-darwin-mkrospace +x86-darwin-link-flags +x86-darwin-fix-rospace +x86-darwin-mkrospace diff --git a/src/runtime/x86-assem.S b/src/runtime/x86-assem.S index 0deae4f..e3032e2 100644 --- a/src/runtime/x86-assem.S +++ b/src/runtime/x86-assem.S @@ -37,18 +37,6 @@ #define GNAME(var) _##var #endif -#if defined __linux__ || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined __sun -#define GNAMEDOLLAR(var) $##var -#else -#define GNAMEDOLLAR(var) $_##var -#endif - -#if defined __linux__ || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined __sun -#define DOLLARLITERAL(var) $##var -#else -#define DOLLARLITERAL(var) $##(var) -#endif - /* Get the right type of alignment. Linux, FreeBSD and NetBSD (but not OpenBSD) * want alignment in bytes. * @@ -209,7 +197,7 @@ GNAME(call_into_lisp_first_time): movl THREAD_CONTROL_STACK_START_OFFSET(%eax) ,%esp /* don't think too hard about what happens if we get interrupted * here */ - addl DOLLARLITERAL(THREAD_CONTROL_STACK_SIZE),%esp + addl $(THREAD_CONTROL_STACK_SIZE),%esp #else /* Win32 -really- doesn't like you switching stacks out from under it. */ movl GNAME(all_threads),%eax @@ -388,8 +376,8 @@ GNAME(fun_end_breakpoint_guts): movl %esp,%ebx # Setup ebx - the ofp. subl $4,%esp # Allocate one stack slot for the return value movl $4,%ecx # Setup ecx for one return value. - movl DOLLARLITERAL(NIL),%edi # default second value - movl DOLLARLITERAL(NIL),%esi # default third value + movl $(NIL),%edi # default second value + movl $(NIL),%esi # default third value multiple_value_return: @@ -937,10 +925,10 @@ GNAME(fast_bzero_detect): * for all non-SSE2 processors. */ Lbase: - movl GNAMEDOLLAR(fast_bzero_base), GNAME(fast_bzero_pointer) + movl $(GNAME(fast_bzero_base)), GNAME(fast_bzero_pointer) jmp Lrestore Lsse2: - movl GNAMEDOLLAR(fast_bzero_sse), GNAME(fast_bzero_pointer) + movl $(GNAME(fast_bzero_sse)), GNAME(fast_bzero_pointer) jmp Lrestore Lrestore: diff --git a/version.lisp-expr b/version.lisp-expr index 81e61d6..d407abd 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.9.10.34" +"0.9.10.35" -- 1.7.10.4