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

VM: signal_error and fp_trap_error not needed, call general_error directly

db4
Björn Lindqvist 2015-08-03 23:45:20 +02:00
parent 73956db33a
commit 504be0c7cb
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vm/errors.cpp
View File

@ -133,21 +133,11 @@ void factor_vm::memory_protection_error(cell pc, cell addr) {
general_error(ERROR_MEMORY, from_unsigned_cell(addr), false_object); general_error(ERROR_MEMORY, from_unsigned_cell(addr), false_object);
} }
/* Allocates memory */
void factor_vm::signal_error(cell signal) {
general_error(ERROR_SIGNAL, from_unsigned_cell(signal), false_object);
}
/* Allocates memory */ /* Allocates memory */
void factor_vm::divide_by_zero_error() { void factor_vm::divide_by_zero_error() {
general_error(ERROR_DIVIDE_BY_ZERO, false_object, false_object); general_error(ERROR_DIVIDE_BY_ZERO, false_object, false_object);
} }
/* Allocates memory */
void factor_vm::fp_trap_error(unsigned int fpu_status) {
general_error(ERROR_FP_TRAP, tag_fixnum(fpu_status), false_object);
}
/* For testing purposes */ /* For testing purposes */
/* Allocates memory */ /* Allocates memory */
void factor_vm::primitive_unimplemented() { not_implemented_error(); } void factor_vm::primitive_unimplemented() { not_implemented_error(); }
@ -169,7 +159,7 @@ void memory_signal_handler_impl() {
/* Allocates memory */ /* Allocates memory */
void factor_vm::synchronous_signal_handler_impl() { void factor_vm::synchronous_signal_handler_impl() {
signal_error(signal_number); general_error(ERROR_SIGNAL, from_unsigned_cell(signal_number), false_object);
} }
/* Allocates memory */ /* Allocates memory */
@ -182,7 +172,7 @@ void factor_vm::fp_signal_handler_impl() {
/* Clear pending exceptions to avoid getting stuck in a loop */ /* Clear pending exceptions to avoid getting stuck in a loop */
set_fpu_state(get_fpu_state()); set_fpu_state(get_fpu_state());
fp_trap_error(signal_fpu_status); general_error(ERROR_FP_TRAP, tag_fixnum(signal_fpu_status), false_object);
} }
/* Allocates memory */ /* Allocates memory */

2
vm/vm.hpp
View File

@ -218,9 +218,7 @@ struct factor_vm {
void not_implemented_error(); void not_implemented_error();
void verify_memory_protection_error(cell addr); void verify_memory_protection_error(cell addr);
void memory_protection_error(cell pc, cell addr); void memory_protection_error(cell pc, cell addr);
void signal_error(cell signal);
void divide_by_zero_error(); void divide_by_zero_error();
void fp_trap_error(unsigned int fpu_status);
void primitive_unimplemented(); void primitive_unimplemented();
void memory_signal_handler_impl(); void memory_signal_handler_impl();
void synchronous_signal_handler_impl(); void synchronous_signal_handler_impl();