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

Fixing walker, adding traceback tests

db4
Slava Pestov 2008-11-23 21:40:54 -06:00
parent eeb2133ba2
commit 1d6e389d18
4 changed files with 71 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basis/tools/walker/walker-tests.factor
View File

@ -17,7 +17,11 @@ IN: tools.walker.tests
] unit-test
[ { "Yo" 2 } ] [
[ 2 >r "Yo" r> ] test-walker
[ 2 [ "Yo" ] dip ] test-walker
] unit-test
[ { "Yo" 2 3 } ] [
[ 2 [ "Yo" ] dip 3 ] test-walker
] unit-test
[ { 2 } ] [

26
basis/tools/walker/walker.factor
View File

@ -64,6 +64,12 @@ M: object add-breakpoint ;
: (step-into-quot) ( quot -- ) add-breakpoint call ;
: (step-into-dip) ( quot -- ) add-breakpoint dip ;
: (step-into-2dip) ( quot -- ) add-breakpoint 2dip ;
: (step-into-3dip) ( quot -- ) add-breakpoint 3dip ;
: (step-into-if) ( true false ? -- ) ? (step-into-quot) ;
: (step-into-dispatch) ( array n -- ) nth (step-into-quot) ;
@ -130,6 +136,9 @@ SYMBOL: +stopped+
{
{ call [ (step-into-quot) ] }
{ dip [ (step-into-dip) ] }
{ 2dip [ (step-into-2dip) ] }
{ 3dip [ (step-into-3dip) ] }
{ (throw) [ drop (step-into-quot) ] }
{ execute [ (step-into-execute) ] }
{ if [ (step-into-if) ] }
@ -152,13 +161,16 @@ SYMBOL: +stopped+
: step-into-msg ( continuation -- continuation' )
[
swap cut [
swap % unclip {
{ [ dup \ break eq? ] [ , ] }
{ [ dup quotation? ] [ add-breakpoint , \ break , ] }
{ [ dup array? ] [ add-breakpoint , \ break , ] }
{ [ dup word? ] [ literalize , \ (step-into-execute) , ] }
[ , \ break , ]
} cond %
swap %
[ \ break , ] [
unclip {
{ [ dup \ break eq? ] [ , ] }
{ [ dup quotation? ] [ add-breakpoint , \ break , ] }
{ [ dup array? ] [ add-breakpoint , \ break , ] }
{ [ dup word? ] [ literalize , \ (step-into-execute) , ] }
[ , \ break , ]
} cond %
] if-empty
] [ ] make
] change-frame ;

41
core/kernel/kernel-tests.factor
View File

@ -1,7 +1,7 @@
USING: arrays byte-arrays kernel kernel.private math memory
namespaces sequences tools.test math.private quotations
continuations prettyprint io.streams.string debugger assocs
sequences.private ;
sequences.private accessors ;
IN: kernel.tests
[ 0 ] [ f size ] unit-test
@ -124,3 +124,42 @@ IN: kernel.tests
[ [ sq ] tri@ ] must-infer
[ 4 ] [ 1 { [ 1 ] [ 2 ] } dispatch sq ] unit-test
! Test traceback accuracy
: last-frame ( -- pair )
error-continuation get call>> callstack>array 4 head* 2 tail* ;
[
{ [ 1 2 [ 3 throw ] call 4 ] 3 }
] [
[ [ 1 2 [ 3 throw ] call 4 ] call ] ignore-errors
last-frame
] unit-test
[
{ [ 1 2 [ 3 throw ] dip 4 ] 3 }
] [
[ [ 1 2 [ 3 throw ] dip 4 ] call ] ignore-errors
last-frame
] unit-test
[
{ [ 1 2 3 throw [ ] call 4 ] 3 }
] [
[ [ 1 2 3 throw [ ] call 4 ] call ] ignore-errors
last-frame
] unit-test
[
{ [ 1 2 3 throw [ ] dip 4 ] 3 }
] [
[ [ 1 2 3 throw [ ] dip 4 ] call ] ignore-errors
last-frame
] unit-test
[
{ [ 1 2 3 throw [ ] [ ] if 4 ] 3 }
] [
[ [ 1 2 3 throw [ ] [ ] if 4 ] call ] ignore-errors
last-frame
] unit-test

13
vm/quotations.c
View File

@ -348,8 +348,10 @@ worse than the duplication itself (eg, putting all state in some global
struct.) */
#define COUNT(name,scan) \
{ \
CELL size = array_capacity(code_to_emit(name)) * code_format; \
if(offset == 0) return scan - 1; \
offset -= array_capacity(code_to_emit(name)) * code_format; \
if(offset < size) return scan + 1; \
offset -= size; \
}
F_FIXNUM quot_code_offset_to_scan(CELL quot, F_FIXNUM offset)
@ -411,29 +413,28 @@ F_FIXNUM quot_code_offset_to_scan(CELL quot, F_FIXNUM offset)
if(stack_frame)
COUNT(userenv[JIT_EPILOG],i)
i += 2;
COUNT(userenv[JIT_IF_JUMP],i)
i += 2;
tail_call = true;
break;
}
else if(jit_fast_dip_p(untag_object(array),i))
{
i++;
COUNT(userenv[JIT_DIP],i)
i++;
break;
}
else if(jit_fast_2dip_p(untag_object(array),i))
{
i++;
COUNT(userenv[JIT_2DIP],i)
i++;
break;
}
else if(jit_fast_3dip_p(untag_object(array),i))
{
i++;
COUNT(userenv[JIT_3DIP],i)
i++;
break;
}
case ARRAY_TYPE: