github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-29 04:51:28 +00:00
Code Issues Projects Releases Wiki Activity

NEW_STORAGE is no longer new. (#135)

Browse Source 
* Always follow NEW_STORAGE code paths.

This removes the code paths for the pre-NEW_STORAGE code.

* Remove NEW_STORAGE from build system.

The code no longer refers to `NEW_STORAGE`, so we can remove
this from the build system.
This commit is contained in:
Bruce Mitchener
2020-12-29 01:10:43 +07:00
committed by GitHub
parent 14402131e7
commit 01926fc232
51 changed files with 52 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/initsout.c
View File

@@ -108,10 +108,8 @@ LispPTR *fixp_value(LispPTR *ptr) {
void init_ifpage(int sysout_size) {
extern long MDate;
extern int DisplayType;
#ifdef NEW_STORAGE
extern int Storage_expanded;
int new_lastvmem;
#endif
/*
Initialize IFPAGE
*/
@@ -122,7 +120,6 @@ void init_ifpage(int sysout_size) {
#endif /* NOETHER */
/*InterfacePage->dl24bitaddressable = (sysout_size == 32? 0xffff : 0);*/
InterfacePage->dl24bitaddressable = (sysout_size == 8 ? 0 : 0xffff);
#ifdef NEW_STORAGE
new_lastvmem = (sysout_size * PAGES_IN_MBYTE) - 1;
if ((!Storage_expanded) && (InterfacePage->dllastvmempage != new_lastvmem)) {
@@ -135,9 +132,6 @@ void init_ifpage(int sysout_size) {
}
/* Set current process size */
InterfacePage->process_size = sysout_size;
#else
InterfacePage->dllastvmempage = LASTVMEMPAGE;
#endif /* NEW_STORAGE */
#ifdef BIGVM
/* For BIGVM system, save the value in \LASTVMEMFILEPAGE for lisp's use */

4
src/ldsout.c
View File

@@ -141,7 +141,6 @@ int sysout_loader(char * sysout_file_name, int sys_size)
exit(-1);
}
#endif /* NOVERSION */
#ifdef NEW_STORAGE
if (sys_size == 0) /* use default or the previous one */
{
if (ifpage.process_size == 0) /* Pure LISP.SYSOUT */
@@ -180,9 +179,6 @@ int sysout_loader(char * sysout_file_name, int sys_size)
/* You can use secondary space , though it was STORAGEFULL
So, STORAGEFULL may be set to NIL later */
}
#else
if (sys_size == 0) sys_size = DEFAULT_MAX_SYSOUTSIZE;
#endif /* NEW_STORAGE */
/* allocate Virtual Memory Space */

2
src/main.c
View File

@@ -532,9 +532,7 @@ int main(int argc, char *argv[])
init_ifpage(sysout_size); /* init interface page */
init_iopage();
init_miscstats();
#ifdef NEW_STORAGE
init_storage();
#endif /* NEW_STORAGE */
set_cursor();

2
src/tstsout.c
View File

@@ -72,9 +72,7 @@ void check_sysout(char *sysout_file_name, int verbose) {
if (verbose) {
printf("ifpage.minbversion %d\n", ifpage.minbversion);
printf("ifpage.process_size %d\n", ifpage.process_size);
#ifdef NEW_STORAGE
printf("ifpage.storagefullstate %d\n", ifpage.storagefullstate);
#endif
printf("ifpage.nactivepages %d\n", ifpage.nactivepages);
} else {
printf("%d", ifpage.minbversion);

2
src/vmemsave.c
View File

@@ -387,7 +387,6 @@ LispPTR vmem_save(char *sysout_file_name)
InterfacePage->machinetype = KATANA;
#ifdef NEW_STORAGE
/* Restore storagefull state */
if (((*STORAGEFULLSTATE_word) & 0xffff) == SFS_NOTSWITCHABLE) {
/* This sysout uses only 8 Mbyte lisp space.
@@ -402,7 +401,6 @@ LispPTR vmem_save(char *sysout_file_name)
/* Otherwise, just restore storagefullstate in IFPAGE */
InterfacePage->storagefullstate = (*STORAGEFULLSTATE_word) & 0xffff;
}
#endif /* NEW_STORAGE */
/* First, sort fptovp table, trying to get pages contiguous */
#ifndef BIGVM