From 11bde920575cea28bafc6c3a40429ad2759c6cda Mon Sep 17 00:00:00 2001 From: Phil Dawes Date: Mon, 17 Aug 2009 21:37:19 +0100 Subject: [PATCH] removed some global functions from errors.cpp --- vm/errors.cpp | 25 ------------------------- vm/errors.hpp | 5 ----- 2 files changed, 30 deletions(-) mode change 100644 => 100755 vm/errors.hpp diff --git a/vm/errors.cpp b/vm/errors.cpp index 23833960e1..f2cab405a8 100755 --- a/vm/errors.cpp +++ b/vm/errors.cpp @@ -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) { 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); } -void type_error(cell type, cell tagged) -{ - return vm->type_error(type, tagged); -} - void factorvm::not_implemented_error() { 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; } -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) { 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); } -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) { 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() { general_error(ERROR_DIVIDE_BY_ZERO,F,F,NULL); diff --git a/vm/errors.hpp b/vm/errors.hpp old mode 100644 new mode 100755 index 7f3c4dcd4a..69a90b70e2 --- a/vm/errors.hpp +++ b/vm/errors.hpp @@ -29,12 +29,7 @@ void critical_error(const char* msg, cell tagged); 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 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 fp_trap_error(unsigned int fpu_status, stack_frame *signal_callstack_top);