github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-03-02 17:54:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #350 from Interlisp/ldsout-heap-fptovp

Browse Source 
Allocate fptovp temporary table in heap
This commit is contained in:
Nick Briggs
2021-02-12 08:05:20 -08:00
committed by GitHub
parent 694d9b08c6 0d7dcc24bd
commit 6fe94fd655
1 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/ldsout.c
View File

@@ -2,11 +2,11 @@
*/
/************************************************************************/
/* */
/* (C) Copyright 1989, 1990, 1990, 1991, 1992, 1993, 1994, 1998 Venue. */
/* All Rights Reserved. */
/* Manufactured in the United States of America. */
/* */
/* */
/* (C) Copyright 1989, 1990, 1990, 1991, 1992, 1993, 1994, 1998 Venue. */
/* All Rights Reserved. */
/* Manufactured in the United States of America. */
/* */
/************************************************************************/
#include "version.h"
@@ -40,16 +40,15 @@
#define MAX_EXPLICIT_SYSOUTSIZE 256 /* Max possible sysout size is 64Mb */
#define MBYTE 0x100000 /* 1 Mbyte */
/* Flag for indication whether process space
is going to expand or not */
/* Flag for indication whether process space is going to expand or not */
int Storage_expanded; /* T or NIL */
/************************************************************************/
/* */
/* s y s o u t _ l o a d e r */
/* */
/* Load the sysout file into memory. */
/* */
/* */
/* s y s o u t _ l o a d e r */
/* */
/* Load the sysout file into memory. */
/* */
/************************************************************************/
#if defined(DOS) || defined(XWINDOW)
#include "devif.h"
@@ -58,17 +57,16 @@ extern DspInterface currentdsp;
#endif /* DOS || XWINDOW */
/* sys_size is sysout size in megabytes */
int sysout_loader(const char * sysout_file_name, int sys_size)
{
int sysout_loader(const char *sysout_file_name, int sys_size) {
int sysout; /* SysoutFile descriptor */
IFPAGE ifpage; /* IFPAGE */
#ifdef BIGVM
/* 1 "cell" per page for 256MB in 512 byte pages */
unsigned int fptovp[0x80000]; /* FPTOVP */
unsigned int *fptovp;
#else
DLword fptovp[0x10000]; /* FPTOVP */
DLword *fptovp; /* FPTOVP */
#endif /* BIGVM */
long fptovp_offset; /* FPTOVP start offset */
@@ -138,8 +136,9 @@ int sysout_loader(const char * sysout_file_name, int sys_size)
exit(-1);
}
#endif /* NOVERSION */
if (sys_size == 0) /* use default or the previous one */
{
/* use default or the previous one */
if (sys_size == 0) {
if (ifpage.process_size == 0) /* Pure LISP.SYSOUT */
sys_size = DEFAULT_MAX_SYSOUTSIZE; /* default for pure SYSOUT */
else
@@ -221,7 +220,7 @@ int sysout_loader(const char * sysout_file_name, int sys_size)
if ((stat_buf.st_size & (BYTESPER_PAGE - 1)) != 0)
printf("CAUTION::not an integral number of pages. sysout & 0x1ff = 0x%x\n",
(int)(stat_buf.st_size & (BYTESPER_PAGE - 1)));
(int)(stat_buf.st_size & (BYTESPER_PAGE - 1)));
if (ifpage.nactivepages != (sysout_size / 2)) {
printf("sysout_loader:IFPAGE says sysout size is %d\n", ifpage.nactivepages);
@@ -244,23 +243,28 @@ int sysout_loader(const char * sysout_file_name, int sys_size)
exit(-1);
}
/* read FPTOVP */
/* read FPTOVP */
#ifdef BIGVM
/* fptovp is now in cells, not words */
fptovp = malloc(sysout_size * 2 + 4);
if (read(sysout, fptovp, sysout_size * 2) == -1) {
perror("sysout_loader: can't read FPTOVP");
free(fptovp);
exit(-1);
}
#ifdef BYTESWAP
word_swap_page((unsigned short *)fptovp, (sysout_size / 2) + 1); /* So space to swap is twice as big, too. */
#endif /* BYTESWAP */
/* So space to swap is twice as big, too. */
word_swap_page((unsigned short *)fptovp, (sysout_size / 2) + 1);
#endif /* BYTESWAP */
#else
fptovp = malloc(sysout_size + 2);
if (read(sysout, fptovp, sysout_size) == -1) {
perror("sysout_loader: can't read FPTOVP");
free(fptovp);
exit(-1);
}
@@ -303,6 +307,7 @@ int sysout_loader(const char * sysout_file_name, int sys_size)
if (GETPAGEOK(fptovp, i) != 0177777) {
if (lseek(sysout, i * BYTESPER_PAGE, SEEK_SET) == -1) {
perror("sysout_loader: can't seek sysout file");
free(fptovp);
exit(-1);
};
lispworld_offset = GETFPTOVP(fptovp, i) * BYTESPER_PAGE;
@@ -315,6 +320,7 @@ int sysout_loader(const char * sysout_file_name, int sys_size)
int j;
for (j = 0; j < 10; j++) printf(" %d: 0x%x ", j, GETFPTOVP(fptovp, j));
}
free(fptovp);
exit(-1);
};
#ifdef BYTESWAP
@@ -322,7 +328,7 @@ int sysout_loader(const char * sysout_file_name, int sys_size)
#endif
};
}
free(fptovp);
DBPRINT(("sysout file is read completely.\n"));
#if (defined(DISPLAYBUFFER) || defined(XWINDOW) || defined(DOS))