From: Guillermo J. Rozas Date: Wed, 3 Oct 1990 15:16:32 +0000 (+0000) Subject: Remove compiled_code_error_code, no longer used. X-Git-Tag: 20090517-FFI~11160 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=0cfef983768a666c6a357ab08217d4165e963c0a;p=mit-scheme.git Remove compiled_code_error_code, no longer used. --- diff --git a/v7/src/microcode/extern.h b/v7/src/microcode/extern.h index 26e4c52b0..b9293fcfc 100644 --- a/v7/src/microcode/extern.h +++ b/v7/src/microcode/extern.h @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/extern.h,v 9.37 1990/08/16 19:19:49 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/extern.h,v 9.38 1990/10/03 15:14:36 jinx Exp $ Copyright (c) 1987, 1988, 1989, 1990 Massachusetts Institute of Technology @@ -123,9 +123,7 @@ extern long IntEnb, /* Interrupts enabled */ temp_long, /* temporary for sign extension */ GC_Reserve, /* Scheme pointer overflow space in heap */ - GC_Space_Needed, /* Amount of space needed when GC triggered */ - /* Used to signal microcode errors from compiled code. */ - compiled_code_error_code; + GC_Space_Needed; /* Amount of space needed when GC triggered */ extern char * Return_Names []; extern long MAX_RETURN; diff --git a/v7/src/microcode/interp.c b/v7/src/microcode/interp.c index 989e7ef06..61f99e0e6 100644 --- a/v7/src/microcode/interp.c +++ b/v7/src/microcode/interp.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/interp.c,v 9.56 1990/06/20 17:41:10 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/interp.c,v 9.57 1990/10/03 15:16:32 jinx Exp $ Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology @@ -1688,18 +1688,18 @@ Perform_Application: case TC_COMPILED_ENTRY: { - apply_compiled_setup(STACK_ENV_EXTRA_SLOTS + - OBJECT_DATUM (STACK_REF (STACK_ENV_HEADER))); - Export_Registers(); + apply_compiled_setup (STACK_ENV_EXTRA_SLOTS + + (OBJECT_DATUM (STACK_REF (STACK_ENV_HEADER)))); + Export_Registers (); Which_Way = apply_compiled_procedure(); return_from_compiled_code: - Import_Registers(); + Import_Registers (); switch (Which_Way) { case PRIM_DONE: { - compiled_code_done(); + compiled_code_done (); goto Pop_Return; } @@ -1724,17 +1724,6 @@ return_from_compiled_code: Prepare_Apply_Interrupt (); Interrupt (PENDING_INTERRUPTS ()); } - - /* The assembly language interfaces return errors - here. The portable version does not. - */ - case ERR_COMPILED_CODE_ERROR: - { - /* The compiled code is signalling a microcode error. */ - compiled_error_backout(); - /* The Save_Cont is done by Pop_Return_Error. */ - Pop_Return_Error( compiled_code_error_code); - } case ERR_INAPPLICABLE_OBJECT: /* This error code means that apply_compiled_procedure @@ -1746,8 +1735,8 @@ return_from_compiled_code: case ERR_WRONG_NUMBER_OF_ARGUMENTS: { - apply_compiled_backout(); - Apply_Error( Which_Way); + apply_compiled_backout (); + Apply_Error (Which_Way); } case ERR_EXECUTE_MANIFEST_VECTOR: @@ -1757,10 +1746,10 @@ return_from_compiled_code: This is a kludge! */ - execute_compiled_backout(); + execute_compiled_backout (); Val = (OBJECT_NEW_TYPE (TC_COMPILED_ENTRY, (Fetch_Expression ()))); - Pop_Return_Error( Which_Way); + Pop_Return_Error (Which_Way); } case ERR_INAPPLICABLE_CONTINUATION: @@ -1770,14 +1759,14 @@ return_from_compiled_code: in a system without compiler support. */ - Store_Expression(SHARP_F); - Store_Return(RC_REENTER_COMPILED_CODE); - Pop_Return_Error(Which_Way); + Store_Expression (SHARP_F); + Store_Return (RC_REENTER_COMPILED_CODE); + Pop_Return_Error (Which_Way); } default: - compiled_error_backout(); - Pop_Return_Error(Which_Way); + compiled_error_backout (); + Pop_Return_Error (Which_Way); } } diff --git a/v7/src/microcode/storage.c b/v7/src/microcode/storage.c index 8563d1790..f3971ebd8 100644 --- a/v7/src/microcode/storage.c +++ b/v7/src/microcode/storage.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/storage.c,v 9.46 1990/06/20 17:42:13 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/storage.c,v 9.47 1990/10/03 15:15:05 jinx Rel $ Copyright (c) 1987, 1988, 1989, 1990 Massachusetts Institute of Technology @@ -69,9 +69,7 @@ long IntEnb, /* Interrupts enabled */ temp_long, /* temporary for sign extension */ GC_Reserve, /* Scheme pointer overflow space in heap */ - GC_Space_Needed, /* Amount of space needed when GC triggered */ - /* Used to signal microcode errors from compiled code. */ - compiled_code_error_code; + GC_Space_Needed; /* Amount of space needed when GC triggered */ Declare_Fixed_Objects (); diff --git a/v8/src/microcode/interp.c b/v8/src/microcode/interp.c index 181e90bf7..020547127 100644 --- a/v8/src/microcode/interp.c +++ b/v8/src/microcode/interp.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/interp.c,v 9.56 1990/06/20 17:41:10 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/interp.c,v 9.57 1990/10/03 15:16:32 jinx Exp $ Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology @@ -1688,18 +1688,18 @@ Perform_Application: case TC_COMPILED_ENTRY: { - apply_compiled_setup(STACK_ENV_EXTRA_SLOTS + - OBJECT_DATUM (STACK_REF (STACK_ENV_HEADER))); - Export_Registers(); + apply_compiled_setup (STACK_ENV_EXTRA_SLOTS + + (OBJECT_DATUM (STACK_REF (STACK_ENV_HEADER)))); + Export_Registers (); Which_Way = apply_compiled_procedure(); return_from_compiled_code: - Import_Registers(); + Import_Registers (); switch (Which_Way) { case PRIM_DONE: { - compiled_code_done(); + compiled_code_done (); goto Pop_Return; } @@ -1724,17 +1724,6 @@ return_from_compiled_code: Prepare_Apply_Interrupt (); Interrupt (PENDING_INTERRUPTS ()); } - - /* The assembly language interfaces return errors - here. The portable version does not. - */ - case ERR_COMPILED_CODE_ERROR: - { - /* The compiled code is signalling a microcode error. */ - compiled_error_backout(); - /* The Save_Cont is done by Pop_Return_Error. */ - Pop_Return_Error( compiled_code_error_code); - } case ERR_INAPPLICABLE_OBJECT: /* This error code means that apply_compiled_procedure @@ -1746,8 +1735,8 @@ return_from_compiled_code: case ERR_WRONG_NUMBER_OF_ARGUMENTS: { - apply_compiled_backout(); - Apply_Error( Which_Way); + apply_compiled_backout (); + Apply_Error (Which_Way); } case ERR_EXECUTE_MANIFEST_VECTOR: @@ -1757,10 +1746,10 @@ return_from_compiled_code: This is a kludge! */ - execute_compiled_backout(); + execute_compiled_backout (); Val = (OBJECT_NEW_TYPE (TC_COMPILED_ENTRY, (Fetch_Expression ()))); - Pop_Return_Error( Which_Way); + Pop_Return_Error (Which_Way); } case ERR_INAPPLICABLE_CONTINUATION: @@ -1770,14 +1759,14 @@ return_from_compiled_code: in a system without compiler support. */ - Store_Expression(SHARP_F); - Store_Return(RC_REENTER_COMPILED_CODE); - Pop_Return_Error(Which_Way); + Store_Expression (SHARP_F); + Store_Return (RC_REENTER_COMPILED_CODE); + Pop_Return_Error (Which_Way); } default: - compiled_error_backout(); - Pop_Return_Error(Which_Way); + compiled_error_backout (); + Pop_Return_Error (Which_Way); } }