diff --git a/src/mred/mred.cxx b/src/mred/mred.cxx index 65ff717a0a..aefe52995d 100644 --- a/src/mred/mred.cxx +++ b/src/mred/mred.cxx @@ -3191,8 +3191,6 @@ static Scheme_Env *setup_basic_env() wxREGGLOB(global_env); global_env = scheme_basic_env(); - scheme_no_dumps("the graphics library is running"); - scheme_set_banner(BANNER); wxmeExpandFilename = CallSchemeExpand; diff --git a/src/mzscheme/cmdline.inc b/src/mzscheme/cmdline.inc index 422cf2c6f5..fca838b2c1 100644 --- a/src/mzscheme/cmdline.inc +++ b/src/mzscheme/cmdline.inc @@ -116,13 +116,15 @@ static char *make_embedded_load(const char *start, const char *end) } #endif -#define mzcmd_EVAL 0 -#define mzcmd_LOAD 1 -#define mzcmd_MAIN 2 -#define mzcmd_REQUIRE_FILE 3 -#define mzcmd_REQUIRE_LIB 4 -#define mzcmd_REQUIRE_PLANET 5 -#define mzcmd_EMBEDDED 6 +enum { + mzcmd_EVAL = 0, + mzcmd_LOAD = 1, + mzcmd_MAIN = 2, + mzcmd_REQUIRE_FILE = 3, + mzcmd_REQUIRE_LIB = 4, + mzcmd_REQUIRE_PLANET = 5, + mzcmd_EMBEDDED = 6, +}; /* To avoid having to create a specific mark procedure for prcise GC, split argument information into purely atomic diff --git a/src/mzscheme/include/mzscheme.exp b/src/mzscheme/include/mzscheme.exp index 4098fc1d40..bf0423a069 100644 --- a/src/mzscheme/include/mzscheme.exp +++ b/src/mzscheme/include/mzscheme.exp @@ -552,7 +552,6 @@ scheme_check_proc_arity scheme_check_proc_arity2 scheme_make_provided_string scheme_make_args_string -scheme_no_dumps scheme_system_library_subpath scheme_signal_received scheme_char_strlen diff --git a/src/mzscheme/include/mzscheme3m.exp b/src/mzscheme/include/mzscheme3m.exp index 685d1e3f4b..58cbaf21ef 100644 --- a/src/mzscheme/include/mzscheme3m.exp +++ b/src/mzscheme/include/mzscheme3m.exp @@ -563,7 +563,6 @@ scheme_check_proc_arity scheme_check_proc_arity2 scheme_make_provided_string scheme_make_args_string -scheme_no_dumps scheme_system_library_subpath scheme_signal_received scheme_char_strlen diff --git a/src/mzscheme/include/mzwin.def b/src/mzscheme/include/mzwin.def index 2db8f8349c..ab2b02268b 100644 --- a/src/mzscheme/include/mzwin.def +++ b/src/mzscheme/include/mzwin.def @@ -540,7 +540,6 @@ EXPORTS scheme_check_proc_arity2 scheme_make_provided_string scheme_make_args_string - scheme_no_dumps scheme_system_library_subpath scheme_signal_received scheme_char_strlen diff --git a/src/mzscheme/include/mzwin3m.def b/src/mzscheme/include/mzwin3m.def index cf1c0bab7b..dfa3cb862f 100644 --- a/src/mzscheme/include/mzwin3m.def +++ b/src/mzscheme/include/mzwin3m.def @@ -555,7 +555,6 @@ EXPORTS scheme_check_proc_arity2 scheme_make_provided_string scheme_make_args_string - scheme_no_dumps scheme_system_library_subpath scheme_signal_received scheme_char_strlen diff --git a/src/mzscheme/src/env.c b/src/mzscheme/src/env.c index c64b5e5976..ec67a2e92d 100644 --- a/src/mzscheme/src/env.c +++ b/src/mzscheme/src/env.c @@ -54,11 +54,16 @@ int scheme_get_allow_set_undefined() { return scheme_allow_set_undefined; } int scheme_starting_up; -Scheme_Object *scheme_local[MAX_CONST_LOCAL_POS][2][3]; +#define MAX_CONST_LOCAL_POS 64 +#define MAX_CONST_LOCAL_TYPES 2 +#define MAX_CONST_LOCAL_FLAG_VAL 2 +#define SCHEME_LOCAL_FLAGS_MASK 0x3 +static Scheme_Object *scheme_local[MAX_CONST_LOCAL_POS][MAX_CONST_LOCAL_TYPES][MAX_CONST_LOCAL_FLAG_VAL + 1]; #define MAX_CONST_TOPLEVEL_DEPTH 16 #define MAX_CONST_TOPLEVEL_POS 16 -Scheme_Object *toplevels[MAX_CONST_TOPLEVEL_DEPTH][MAX_CONST_TOPLEVEL_POS][SCHEME_TOPLEVEL_FLAGS_MASK + 1]; +#define SCHEME_TOPLEVEL_FLAGS_MASK 0x3 +static Scheme_Object *toplevels[MAX_CONST_TOPLEVEL_DEPTH][MAX_CONST_TOPLEVEL_POS][SCHEME_TOPLEVEL_FLAGS_MASK + 1]; #define TABLE_CACHE_MAX_SIZE 2048 Scheme_Hash_Table *toplevels_ht; @@ -1677,11 +1682,10 @@ Scheme_Object *scheme_make_local(Scheme_Type type, int pos, int flags) /* Helper for reading bytecode: make sure flags is a valid value */ switch (flags) { case 0: - break; case SCHEME_LOCAL_CLEAR_ON_READ: + case SCHEME_LOCAL_OTHER_CLEARS: break; default: - case SCHEME_LOCAL_OTHER_CLEARS: flags = SCHEME_LOCAL_OTHER_CLEARS; break; } diff --git a/src/mzscheme/src/read.c b/src/mzscheme/src/read.c index 9b4b2ee432..d932e4216d 100644 --- a/src/mzscheme/src/read.c +++ b/src/mzscheme/src/read.c @@ -4913,21 +4913,15 @@ static Scheme_Object *read_compact(CPort *port, int use_stack) case CPT_SMALL_LOCAL_UNBOX_START: { Scheme_Type type; - int k; if (CPT_BETWEEN(ch, SMALL_LOCAL_UNBOX)) { - k = 1; type = scheme_local_unbox_type; ch -= CPT_SMALL_LOCAL_UNBOX_START; } else { - k = 0; type = scheme_local_type; ch -= CPT_SMALL_LOCAL_START; } - if (ch < MAX_CONST_LOCAL_POS) - v = scheme_local[ch][k][0]; - else - v = scheme_make_local(type, ch, 0); + v = scheme_make_local(type, ch, 0); } break; case CPT_SMALL_MARSHALLED_START: diff --git a/src/mzscheme/src/schemef.h b/src/mzscheme/src/schemef.h index 6e52272f58..bf8ff496cc 100644 --- a/src/mzscheme/src/schemef.h +++ b/src/mzscheme/src/schemef.h @@ -1063,8 +1063,6 @@ MZ_EXTERN int scheme_check_proc_arity2(const char *where, int a, MZ_EXTERN char *scheme_make_provided_string(Scheme_Object *o, int count, int *len); MZ_EXTERN char *scheme_make_args_string(char *s, int which, int argc, Scheme_Object **argv, long *len); -MZ_EXTERN void scheme_no_dumps(char *why); - MZ_EXTERN const char *scheme_system_library_subpath(); MZ_EXTERN void scheme_signal_received(void); diff --git a/src/mzscheme/src/schemex.h b/src/mzscheme/src/schemex.h index 8e86711f3b..5f4c1e29ef 100644 --- a/src/mzscheme/src/schemex.h +++ b/src/mzscheme/src/schemex.h @@ -876,7 +876,6 @@ int (*scheme_check_proc_arity2)(const char *where, int a, int false_ok); char *(*scheme_make_provided_string)(Scheme_Object *o, int count, int *len); char *(*scheme_make_args_string)(char *s, int which, int argc, Scheme_Object **argv, long *len); -void (*scheme_no_dumps)(char *why); const char *(*scheme_system_library_subpath)(); void (*scheme_signal_received)(void); int (*scheme_char_strlen)(const mzchar *s); diff --git a/src/mzscheme/src/schemex.inc b/src/mzscheme/src/schemex.inc index add805befa..db71a6242a 100644 --- a/src/mzscheme/src/schemex.inc +++ b/src/mzscheme/src/schemex.inc @@ -607,7 +607,6 @@ scheme_extension_table->scheme_check_proc_arity2 = scheme_check_proc_arity2; scheme_extension_table->scheme_make_provided_string = scheme_make_provided_string; scheme_extension_table->scheme_make_args_string = scheme_make_args_string; - scheme_extension_table->scheme_no_dumps = scheme_no_dumps; scheme_extension_table->scheme_system_library_subpath = scheme_system_library_subpath; scheme_extension_table->scheme_signal_received = scheme_signal_received; scheme_extension_table->scheme_char_strlen = scheme_char_strlen; diff --git a/src/mzscheme/src/schemexm.h b/src/mzscheme/src/schemexm.h index d496cd9088..135d404f8e 100644 --- a/src/mzscheme/src/schemexm.h +++ b/src/mzscheme/src/schemexm.h @@ -607,7 +607,6 @@ #define scheme_check_proc_arity2 (scheme_extension_table->scheme_check_proc_arity2) #define scheme_make_provided_string (scheme_extension_table->scheme_make_provided_string) #define scheme_make_args_string (scheme_extension_table->scheme_make_args_string) -#define scheme_no_dumps (scheme_extension_table->scheme_no_dumps) #define scheme_system_library_subpath (scheme_extension_table->scheme_system_library_subpath) #define scheme_signal_received (scheme_extension_table->scheme_signal_received) #define scheme_char_strlen (scheme_extension_table->scheme_char_strlen) diff --git a/src/mzscheme/src/schpriv.h b/src/mzscheme/src/schpriv.h index 4f2a9cf1f7..1e43a3cf1b 100644 --- a/src/mzscheme/src/schpriv.h +++ b/src/mzscheme/src/schpriv.h @@ -898,7 +898,6 @@ typedef struct Scheme_Toplevel { #define SCHEME_TOPLEVEL_MUTATED 0x2 #define SCHEME_TOPLEVEL_READY 0x2 /* MUTATED and READY flags are used in different contexts */ -#define SCHEME_TOPLEVEL_FLAGS_MASK 0x3 typedef struct Scheme_Quote_Syntax { Scheme_Object so; /* scheme_quote_syntax_type */ @@ -1933,9 +1932,6 @@ typedef struct { Scheme_Native_Closure_Data *scheme_generate_lambda(Scheme_Closure_Data *obj, int drop_code, Scheme_Native_Closure_Data *case_lam); -#define MAX_CONST_LOCAL_POS 64 -extern Scheme_Object *scheme_local[MAX_CONST_LOCAL_POS][2][3]; - #define scheme_new_frame(n) scheme_new_special_frame(n, 0) #define scheme_extend_env(f, e) (f->basic.next = e, f) #define scheme_next_frame(e) ((e)->basic.next)