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

VM: Refactor errors to Factor style

db4
Erik Charlebois 2013-05-11 21:59:37 -04:00
parent d6bc190f51
commit e9c0476f15
2 changed files with 147 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
vm/errors.cpp
View File

@ -1,19 +1,16 @@
#include "master.hpp"
namespace factor
{
namespace factor {
bool factor_vm::fatal_erroring_p;
static inline void fa_diddly_atal_error()
{
static inline void fa_diddly_atal_error() {
printf("fatal_error in fatal_error!\n");
breakpoint();
::_exit(86);
}
void fatal_error(const char *msg, cell tagged)
{
void fatal_error(const char* msg, cell tagged) {
if (factor_vm::fatal_erroring_p)
fa_diddly_atal_error();
@ -25,8 +22,7 @@ void fatal_error(const char *msg, cell tagged)
abort();
}
void critical_error(const char *msg, cell tagged)
{
void critical_error(const char* msg, cell tagged) {
std::cout << "You have triggered a bug in Factor. Please report.\n";
std::cout << "critical_error: " << msg;
std::cout << ": " << std::hex << tagged << std::dec;
@ -34,16 +30,14 @@ void critical_error(const char *msg, cell tagged)
current_vm()->factorbug();
}
void out_of_memory()
{
void out_of_memory() {
std::cout << "Out of memory\n\n";
current_vm()->dump_generations();
abort();
}
/* Allocates memory */
void factor_vm::general_error(vm_error_type error, cell arg1_, cell arg2_)
{
void factor_vm::general_error(vm_error_type error, cell arg1_, cell arg2_) {
data_root<object> arg1(arg1_, this);
data_root<object> arg2(arg2_, this);
@ -59,16 +53,16 @@ void factor_vm::general_error(vm_error_type error, cell arg1_, cell arg2_)
/* If the error handler is set, we rewind any C stack frames and
pass the error to user-space. */
if(!current_gc && to_boolean(special_objects[ERROR_HANDLER_QUOT]))
{
if (!current_gc && to_boolean(special_objects[ERROR_HANDLER_QUOT])) {
#ifdef FACTOR_DEBUG
/* Doing a GC here triggers all kinds of funny errors */
primitive_compact_gc();
#endif
/* Now its safe to allocate and GC */
cell error_object = allot_array_4(special_objects[OBJ_ERROR],
tag_fixnum(error),arg1.value(),arg2.value());
cell error_object =
allot_array_4(special_objects[OBJ_ERROR], tag_fixnum(error),
arg1.value(), arg2.value());
ctx->push(error_object);
@ -81,32 +75,31 @@ void factor_vm::general_error(vm_error_type error, cell arg1_, cell arg2_)
if it was successfully reached. */
unwind_native_frames(special_objects[ERROR_HANDLER_QUOT],
ctx->callstack_top);
}
/* Error was thrown in early startup before error handler is set, so just
} /* Error was thrown in early startup before error handler is set, so just
crash. */
else
{
else {
std::cout << "You have triggered a bug in Factor. Please report.\n";
std::cout << "error: " << error << std::endl;
std::cout << "arg 1: "; print_obj(arg1.value()); std::cout << std::endl;
std::cout << "arg 2: "; print_obj(arg2.value()); std::cout << std::endl;
std::cout << "arg 1: ";
print_obj(arg1.value());
std::cout << std::endl;
std::cout << "arg 2: ";
print_obj(arg2.value());
std::cout << std::endl;
factorbug();
abort();
}
}
void factor_vm::type_error(cell type, cell tagged)
{
void factor_vm::type_error(cell type, cell tagged) {
general_error(ERROR_TYPE, tag_fixnum(type), tagged);
}
void factor_vm::not_implemented_error()
{
void factor_vm::not_implemented_error() {
general_error(ERROR_NOT_IMPLEMENTED, false_object, false_object);
}
void factor_vm::verify_memory_protection_error(cell addr)
{
void factor_vm::verify_memory_protection_error(cell addr) {
/* Called from the OS-specific top halves of the signal handlers to
make sure it's safe to dispatch to memory_protection_error */
if (fatal_erroring_p)
@ -120,8 +113,7 @@ void factor_vm::verify_memory_protection_error(cell addr)
}
/* Allocates memory */
void factor_vm::memory_protection_error(cell pc, cell addr)
{
void factor_vm::memory_protection_error(cell pc, cell addr) {
if (code->safepoint_p(addr))
safepoint.handle_safepoint(this, pc);
else if (ctx->datastack_seg->underflow_p(addr))
@ -141,63 +133,48 @@ void factor_vm::memory_protection_error(cell pc, cell addr)
}
/* Allocates memory */
void factor_vm::signal_error(cell signal)
{
void factor_vm::signal_error(cell signal) {
general_error(ERROR_SIGNAL, from_unsigned_cell(signal), false_object);
}
void factor_vm::divide_by_zero_error()
{
void factor_vm::divide_by_zero_error() {
general_error(ERROR_DIVIDE_BY_ZERO, false_object, false_object);
}
void factor_vm::fp_trap_error(unsigned int fpu_status)
{
void factor_vm::fp_trap_error(unsigned int fpu_status) {
general_error(ERROR_FP_TRAP, tag_fixnum(fpu_status), false_object);
}
/* For testing purposes */
void factor_vm::primitive_unimplemented()
{
not_implemented_error();
}
void factor_vm::primitive_unimplemented() { not_implemented_error(); }
void factor_vm::memory_signal_handler_impl()
{
void factor_vm::memory_signal_handler_impl() {
memory_protection_error(signal_fault_pc, signal_fault_addr);
if (!signal_resumable)
{
if (!signal_resumable) {
/* In theory we should only get here if the callstack overflowed during a
safepoint */
general_error(ERROR_CALLSTACK_OVERFLOW, false_object, false_object);
}
}
void memory_signal_handler_impl()
{
void memory_signal_handler_impl() {
current_vm()->memory_signal_handler_impl();
}
void factor_vm::synchronous_signal_handler_impl()
{
void factor_vm::synchronous_signal_handler_impl() {
signal_error(signal_number);
}
void synchronous_signal_handler_impl()
{
void synchronous_signal_handler_impl() {
current_vm()->synchronous_signal_handler_impl();
}
void factor_vm::fp_signal_handler_impl()
{
void factor_vm::fp_signal_handler_impl() {
/* Clear pending exceptions to avoid getting stuck in a loop */
set_fpu_state(get_fpu_state());
fp_trap_error(signal_fpu_status);
}
void fp_signal_handler_impl()
{
current_vm()->fp_signal_handler_impl();
}
void fp_signal_handler_impl() { current_vm()->fp_signal_handler_impl(); }
}

6
vm/errors.hpp
View File

@ -1,9 +1,7 @@
namespace factor
{
namespace factor {
/* Runtime errors */
enum vm_error_type
{
enum vm_error_type {
ERROR_EXPIRED = 0,
ERROR_IO,
ERROR_NOT_IMPLEMENTED,