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

removed some global functions from errors.cpp

db4
Phil Dawes 2009-08-17 21:37:19 +01:00
parent 390712b00a
commit d3b5321b6e
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vm/errors.cpp
View File

@ -92,11 +92,6 @@ void factorvm::throw_error(cell error, stack_frame *callstack_top)
} }
} }
void throw_error(cell error, stack_frame *callstack_top)
{
return vm->throw_error(error, callstack_top);
}
void factorvm::general_error(vm_error_type error, cell arg1, cell arg2, stack_frame *callstack_top) void factorvm::general_error(vm_error_type error, cell arg1, cell arg2, stack_frame *callstack_top)
{ {
throw_error(allot_array_4(userenv[ERROR_ENV], throw_error(allot_array_4(userenv[ERROR_ENV],
@ -113,11 +108,6 @@ void factorvm::type_error(cell type, cell tagged)
general_error(ERROR_TYPE,tag_fixnum(type),tagged,NULL); general_error(ERROR_TYPE,tag_fixnum(type),tagged,NULL);
} }
void type_error(cell type, cell tagged)
{
return vm->type_error(type, tagged);
}
void factorvm::not_implemented_error() void factorvm::not_implemented_error()
{ {
general_error(ERROR_NOT_IMPLEMENTED,F,F,NULL); general_error(ERROR_NOT_IMPLEMENTED,F,F,NULL);
@ -139,11 +129,6 @@ bool factorvm::in_page(cell fault, cell area, cell area_size, int offset)
return fault >= area && fault <= area + pagesize; return fault >= area && fault <= area + pagesize;
} }
bool in_page(cell fault, cell area, cell area_size, int offset)
{
return vm->in_page(fault,area,area_size,offset);
}
void factorvm::memory_protection_error(cell addr, stack_frame *native_stack) void factorvm::memory_protection_error(cell addr, stack_frame *native_stack)
{ {
if(in_page(addr, ds_bot, 0, -1)) if(in_page(addr, ds_bot, 0, -1))
@ -160,21 +145,11 @@ void factorvm::memory_protection_error(cell addr, stack_frame *native_stack)
general_error(ERROR_MEMORY,allot_cell(addr),F,native_stack); general_error(ERROR_MEMORY,allot_cell(addr),F,native_stack);
} }
void memory_protection_error(cell addr, stack_frame *native_stack)
{
return vm->memory_protection_error(addr,native_stack);
}
void factorvm::signal_error(int signal, stack_frame *native_stack) void factorvm::signal_error(int signal, stack_frame *native_stack)
{ {
general_error(ERROR_SIGNAL,tag_fixnum(signal),F,native_stack); general_error(ERROR_SIGNAL,tag_fixnum(signal),F,native_stack);
} }
void signal_error(int signal, stack_frame *native_stack)
{
return vm->signal_error(signal, native_stack);
}
void factorvm::divide_by_zero_error() void factorvm::divide_by_zero_error()
{ {
general_error(ERROR_DIVIDE_BY_ZERO,F,F,NULL); general_error(ERROR_DIVIDE_BY_ZERO,F,F,NULL);

5
vm/errors.hpp Normal file → Executable file
View File

@ -29,12 +29,7 @@ void critical_error(const char* msg, cell tagged);
PRIMITIVE(die); PRIMITIVE(die);
void throw_error(cell error, stack_frame *native_stack);
void general_error(vm_error_type error, cell arg1, cell arg2, stack_frame *native_stack); void general_error(vm_error_type error, cell arg1, cell arg2, stack_frame *native_stack);
void divide_by_zero_error();
void memory_protection_error(cell addr, stack_frame *native_stack);
void signal_error(int signal, stack_frame *native_stack);
void type_error(cell type, cell tagged);
void not_implemented_error(); void not_implemented_error();
void fp_trap_error(unsigned int fpu_status, stack_frame *signal_callstack_top); void fp_trap_error(unsigned int fpu_status, stack_frame *signal_callstack_top);