steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://factorcode.org/git/factor

release
U-C4\Administrator 2007-10-06 21:55:13 -05:00
parent 99fc00dde1 038cbed6e6
commit 5e59f2af83
5 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -11,7 +11,7 @@ CFLAGS = -Wall
ifdef DEBUG ifdef DEBUG
CFLAGS += -g CFLAGS += -g
else else
CFLAGS += -O3 -fomit-frame-pointer $(SITE_CFLAGS) CFLAGS += -O3 $(SITE_CFLAGS)
endif endif
ifdef CONFIG ifdef CONFIG

4
vm/Config.unix
View File

@ -1,3 +1,7 @@
#ifndef DEBUG
C_FLAGS += -fomit-frame-pointer
#endif
EXE_SUFFIX = EXE_SUFFIX =
DLL_PREFIX = lib DLL_PREFIX = lib
DLL_EXTENSION = .a DLL_EXTENSION = .a

5
vm/callstack.c
View File

@ -6,6 +6,11 @@ F_FASTCALL void save_callstack_bottom(F_STACK_FRAME *callstack_bottom)
stack_chain->callstack_bottom = callstack_bottom; stack_chain->callstack_bottom = callstack_bottom;
} }
__attribute__((noinline)) void save_callstack_top(F_STACK_FRAME *callstack_top)
{
stack_chain->callstack_top = callstack_top;
}
void iterate_callstack(CELL top, CELL bottom, CALLSTACK_ITER iterator) void iterate_callstack(CELL top, CELL bottom, CALLSTACK_ITER iterator)
{ {
F_STACK_FRAME *frame = (F_STACK_FRAME *)bottom - 1; F_STACK_FRAME *frame = (F_STACK_FRAME *)bottom - 1;

2
vm/callstack.h
View File

@ -1,4 +1,5 @@
F_FASTCALL void save_callstack_bottom(F_STACK_FRAME *callstack_bottom); F_FASTCALL void save_callstack_bottom(F_STACK_FRAME *callstack_bottom);
__attribute__((noinline)) void save_callstack_top(F_STACK_FRAME *callstack_top);
#define FIRST_STACK_FRAME(stack) (F_STACK_FRAME *)((stack) + 1) #define FIRST_STACK_FRAME(stack) (F_STACK_FRAME *)((stack) + 1)
@ -8,6 +9,7 @@ void iterate_callstack(CELL top, CELL bottom, CALLSTACK_ITER iterator);
void iterate_callstack_object(F_CALLSTACK *stack, CALLSTACK_ITER iterator); void iterate_callstack_object(F_CALLSTACK *stack, CALLSTACK_ITER iterator);
F_STACK_FRAME *frame_successor(F_STACK_FRAME *frame); F_STACK_FRAME *frame_successor(F_STACK_FRAME *frame);
CELL frame_executing(F_STACK_FRAME *frame); CELL frame_executing(F_STACK_FRAME *frame);
CELL frame_scan(F_STACK_FRAME *frame);
CELL frame_type(F_STACK_FRAME *frame); CELL frame_type(F_STACK_FRAME *frame);
DECLARE_PRIMITIVE(callstack); DECLARE_PRIMITIVE(callstack);

9
vm/primitives.h
View File

@ -16,19 +16,22 @@ Becomes
F_FASTCALL void primitive_name(CELL word, F_STACK_FRAME *callstack_top) F_FASTCALL void primitive_name(CELL word, F_STACK_FRAME *callstack_top)
{ {
stack_chain->callstack_top = callstack_top; save_callstack_top(callstack_top);
... CODE ... ... CODE ...
} }
On x86, F_FASTCALL expands into a GCC declaration which forces the two On x86, F_FASTCALL expands into a GCC declaration which forces the two
parameters to be passed in registers. This simplifies the quotation compiler parameters to be passed in registers. This simplifies the quotation compiler
and support code in cpu-x86.S. */ and support code in cpu-x86.S.
We do the assignment of stack_chain->callstack_top in a ``noinline'' function
to inhibit assignment re-ordering. */
#define DEFINE_PRIMITIVE(name) \ #define DEFINE_PRIMITIVE(name) \
INLINE void primitive_##name##_impl(void); \ INLINE void primitive_##name##_impl(void); \
\ \
F_FASTCALL void primitive_##name(CELL word, F_STACK_FRAME *callstack_top) \ F_FASTCALL void primitive_##name(CELL word, F_STACK_FRAME *callstack_top) \
{ \ { \
stack_chain->callstack_top = callstack_top; \ save_callstack_top(callstack_top); \
primitive_##name##_impl(); \ primitive_##name##_impl(); \
} \ } \
\ \