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

Merge git://factorcode.org/git/factor

release
Doug Coleman 2007-11-05 15:47:53 -06:00
parent 4b6b96abc4 6d3d12667b
commit 0093d3575a
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/cpu/arm/architecture/architecture.factor
View File

@ -113,7 +113,7 @@ M: arm-backend %jump-label ( label -- ) B ;
: %prepare-primitive ( -- ) : %prepare-primitive ( -- )
#! Save stack pointer to stack_chain->callstack_top, load XT #! Save stack pointer to stack_chain->callstack_top, load XT
R1 SP MOV ; R1 SP 4 SUB ;
M: arm-backend %call-primitive ( word -- ) M: arm-backend %call-primitive ( word -- )
%prepare-primitive %prepare-primitive

22
vm/image.c
View File

@ -92,8 +92,7 @@ void save_image(const F_CHAR *filename)
file = OPEN_WRITE(filename); file = OPEN_WRITE(filename);
if(file == NULL) if(file == NULL)
{ {
FPRINTF(stderr,"Cannot open image file: %s\n",filename); fprintf(stderr,"Cannot open image file: %s\n",strerror(errno));
fprintf(stderr,"%s\n",strerror(errno));
return; return;
} }
@ -122,10 +121,23 @@ void save_image(const F_CHAR *filename)
fwrite(&h,sizeof(F_HEADER),1,file); fwrite(&h,sizeof(F_HEADER),1,file);
fwrite((void*)tenured->start,h.data_size,1,file); if(fwrite((void*)tenured->start,h.data_size,1,file) != 1)
fwrite(first_block(&code_heap),h.code_size,1,file); {
fprintf(stderr,"Save data heap failed: %s\n",strerror(errno));
return;
}
fclose(file); if(fwrite(first_block(&code_heap),h.code_size,1,file) != 1)
{
fprintf(stderr,"Save code heap failed: %s\n",strerror(errno));
return;
}
if(fclose(file))
{
fprintf(stderr,"Failed to close image file: %s\n",strerror(errno));
return;
}
} }
DEFINE_PRIMITIVE(save_image) DEFINE_PRIMITIVE(save_image)