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

db4
Doug Coleman 2009-09-12 21:06:04 -05:00
commit 3a37524c88
4 changed files with 13 additions and 13 deletions

View File

@ -282,12 +282,12 @@ HELP: fp-bitwise=
{ $examples
"Not-a-number equality:"
{ $example
"USING: math prettyprint ;"
"USING: kernel math prettyprint ;"
"0.0 0.0 / dup number= ."
"f"
}
{ $example
"USING: math prettyprint ;"
"USING: kernel math prettyprint ;"
"0.0 0.0 / dup fp-bitwise= ."
"t"
}
@ -299,7 +299,7 @@ HELP: fp-bitwise=
}
{ $example
"USING: math prettyprint ;"
"-0.0 0.0 = ."
"-0.0 0.0 number= ."
"t"
}
} ;

View File

@ -612,8 +612,8 @@ HELP: NAN:
{ $examples
{ $example
"USE: prettyprint"
"NAN: deadbeef ."
"NAN: deadbeef"
"NAN: 80000deadbeef ."
"NAN: 80000deadbeef"
}
} ;

View File

@ -130,9 +130,9 @@ void divide_by_zero_error()
general_error(ERROR_DIVIDE_BY_ZERO,F,F,NULL);
}
void fp_trap_error()
void fp_trap_error(stack_frame *signal_callstack_top)
{
general_error(ERROR_FP_TRAP,F,F,NULL);
general_error(ERROR_FP_TRAP,F,F,signal_callstack_top);
}
PRIMITIVE(call_clear)
@ -158,7 +158,7 @@ void misc_signal_handler_impl()
void fp_signal_handler_impl()
{
fp_trap_error();
fp_trap_error(signal_callstack_top);
}
}

View File

@ -55,12 +55,12 @@ static void call_fault_handler(
MACH_PROGRAM_COUNTER(thread_state) = (cell)memory_signal_handler_impl;
}
else if(exception == EXC_ARITHMETIC && code != MACH_EXC_INTEGER_DIV)
{
{
MACH_PROGRAM_COUNTER(thread_state) = (cell)fp_signal_handler_impl;
}
else
{
signal_number = exception == EXC_ARITHMETIC ? SIGFPE : SIGABRT;
}
else
{
signal_number = (exception == EXC_ARITHMETIC ? SIGFPE : SIGABRT);
MACH_PROGRAM_COUNTER(thread_state) = (cell)misc_signal_handler_impl;
}
}