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

Simplify

slava 2006-11-24 10:08:01 +00:00
parent f9f708739e
commit 3716de2737
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/tools/errors.factor
View File

@ -61,8 +61,7 @@ DEFER: objc-error. ( alien -- )
: callstack-overflow. "Call" stack-overflow. ; : callstack-overflow. "Call" stack-overflow. ;
: memory-error. : memory-error.
"Allocation of " write second pprint "Data heap allocation request failed" print ;
" bytes failed due to insufficient room in data heap" print ;
: kernel-error ( error -- word ) : kernel-error ( error -- word )
#! Kernel errors are indexed by integers. #! Kernel errors are indexed by integers.

2
vm/data_gc.h
View File

@ -257,7 +257,7 @@ INLINE void maybe_gc(CELL a)
if(nursery.here + ALLOT_BUFFER_ZONE > nursery.limit) if(nursery.here + ALLOT_BUFFER_ZONE > nursery.limit)
critical_error("Out of memory in maybe_gc",0); critical_error("Out of memory in maybe_gc",0);
else else
memory_error(a); memory_error();
} }
} }

4
vm/run.c
View File

@ -350,7 +350,7 @@ void type_error(CELL type, CELL tagged)
general_error(ERROR_TYPE,tag_fixnum(type),tagged,true); general_error(ERROR_TYPE,tag_fixnum(type),tagged,true);
} }
void memory_error(CELL bytes) void memory_error(void)
{ {
general_error(ERROR_MEMORY,allot_cell(bytes),F,false); general_error(ERROR_MEMORY,F,F,false);
} }

2
vm/run.h
View File

@ -193,7 +193,7 @@ void general_error(F_ERRORTYPE error, CELL arg1, CELL arg2, bool keep_stacks);
void memory_protection_error(CELL addr, int signal); void memory_protection_error(CELL addr, int signal);
void signal_error(int signal); void signal_error(int signal);
void type_error(CELL type, CELL tagged); void type_error(CELL type, CELL tagged);
void memory_error(CELL bytes); void memory_error(void);
void primitive_throw(void); void primitive_throw(void);
void primitive_die(void); void primitive_die(void);