X-Git-Url: https://jxself.org/git/?p=inform.git;a=blobdiff_plain;f=src%2Fbpatch.c;fp=src%2Fbpatch.c;h=1fd984b0c9b8ebf8c51a25b8287afca0f9a12a83;hp=daca6fbe4552f28b0786ca91b044369d47fbe85c;hb=8e63120c630c94c598d4e2d6ba823dac59bce8fa;hpb=d11f2f726ed7feea617476d99cf7505ddd9a27ce diff --git a/src/bpatch.c b/src/bpatch.c index daca6fb..1fd984b 100644 --- a/src/bpatch.c +++ b/src/bpatch.c @@ -2,8 +2,8 @@ /* "bpatch" : Keeps track of, and finally acts on, backpatch markers, */ /* correcting symbol values not known at compilation time */ /* */ -/* Part of Inform 6.35 */ -/* copyright (c) Graham Nelson 1993 - 2021 */ +/* Part of Inform 6.40 */ +/* copyright (c) Graham Nelson 1993 - 2022 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -22,8 +22,12 @@ #include "header.h" -memory_block zcode_backpatch_table, staticarray_backpatch_table, - zmachine_backpatch_table; +uchar *staticarray_backpatch_table; /* Allocated to staticarray_backpatch_size */ +memory_list staticarray_backpatch_table_memlist; +uchar *zmachine_backpatch_table; /* Allocated to zmachine_backpatch_size */ +memory_list zmachine_backpatch_table_memlist; +uchar *zcode_backpatch_table; /* Allocated to zcode_backpatch_size */ +memory_list zcode_backpatch_table_memlist; int32 zcode_backpatch_size, staticarray_backpatch_size, zmachine_backpatch_size; @@ -38,7 +42,7 @@ static int32 backpatch_value_z(int32 value) ASSERT_ZCODE(); - if (asm_trace_level >= 4) + if (bpatch_trace_setting) printf("BP %s applied to %04x giving ", describe_mv(backpatch_marker), value); @@ -86,7 +90,7 @@ static int32 backpatch_value_z(int32 value) value = value_of_system_constant(value); break; case DWORD_MV: value = dictionary_offset + 7 + - final_dict_order[value]*((version_number==3)?7:9); + final_dict_order[value]*(DICT_ENTRY_BYTE_LENGTH); break; case ACTION_MV: break; @@ -105,10 +109,10 @@ static int32 backpatch_value_z(int32 value) break; case MAIN_MV: value = symbol_index("Main", -1); - if (stypes[value] != ROUTINE_T) + if (symbols[value].type != ROUTINE_T) error("No 'Main' routine has been defined"); - sflags[value] |= USED_SFLAG; - value = svals[value]; + symbols[value].flags |= USED_SFLAG; + value = symbols[value].value; if (OMIT_UNUSED_ROUTINES) value = df_stripped_address_for_address(value); value += code_offset/scale_factor; @@ -123,34 +127,34 @@ static int32 backpatch_value_z(int32 value) value = 0; break; } - if (sflags[value] & UNKNOWN_SFLAG) - { if (!(sflags[value] & UERROR_SFLAG)) - { sflags[value] |= UERROR_SFLAG; + if (symbols[value].flags & UNKNOWN_SFLAG) + { if (!(symbols[value].flags & UERROR_SFLAG)) + { symbols[value].flags |= UERROR_SFLAG; error_named_at("No such constant as", - (char *) symbs[value], slines[value]); + symbols[value].name, symbols[value].line); } } else - if (sflags[value] & CHANGE_SFLAG) - { sflags[value] &= (~(CHANGE_SFLAG)); - backpatch_marker = (svals[value]/0x10000); + if (symbols[value].flags & CHANGE_SFLAG) + { symbols[value].flags &= (~(CHANGE_SFLAG)); + backpatch_marker = (symbols[value].marker); if ((backpatch_marker < 0) || (backpatch_marker > LARGEST_BPATCH_MV)) { if (no_link_errors == 0) { compiler_error_named( "Illegal backpatch marker attached to symbol", - (char *) symbs[value]); + symbols[value].name); backpatch_error_flag = TRUE; } } else - svals[value] = backpatch_value_z((svals[value]) % 0x10000); + symbols[value].value = backpatch_value_z((symbols[value].value) % 0x10000); } - sflags[value] |= USED_SFLAG; - { int t = stypes[value]; - value = svals[value]; + symbols[value].flags |= USED_SFLAG; + { int t = symbols[value].type; + value = symbols[value].value; switch(t) { case ROUTINE_T: if (OMIT_UNUSED_ROUTINES) @@ -172,7 +176,7 @@ static int32 backpatch_value_z(int32 value) break; } - if (asm_trace_level >= 4) printf(" %04x\n", value); + if (bpatch_trace_setting) printf(" %04x\n", value); return(value); } @@ -183,7 +187,7 @@ static int32 backpatch_value_g(int32 value) ASSERT_GLULX(); - if (asm_trace_level >= 4) + if (bpatch_trace_setting) printf("BP %s applied to %04x giving ", describe_mv(backpatch_marker), value); @@ -255,10 +259,10 @@ static int32 backpatch_value_g(int32 value) break; case MAIN_MV: value = symbol_index("Main", -1); - if (stypes[value] != ROUTINE_T) + if (symbols[value].type != ROUTINE_T) error("No 'Main' routine has been defined"); - sflags[value] |= USED_SFLAG; - value = svals[value]; + symbols[value].flags |= USED_SFLAG; + value = symbols[value].value; if (OMIT_UNUSED_ROUTINES) value = df_stripped_address_for_address(value); value += code_offset; @@ -273,34 +277,34 @@ static int32 backpatch_value_g(int32 value) value = 0; break; } - if (sflags[value] & UNKNOWN_SFLAG) - { if (!(sflags[value] & UERROR_SFLAG)) - { sflags[value] |= UERROR_SFLAG; + if (symbols[value].flags & UNKNOWN_SFLAG) + { if (!(symbols[value].flags & UERROR_SFLAG)) + { symbols[value].flags |= UERROR_SFLAG; error_named_at("No such constant as", - (char *) symbs[value], slines[value]); + symbols[value].name, symbols[value].line); } } else - if (sflags[value] & CHANGE_SFLAG) - { sflags[value] &= (~(CHANGE_SFLAG)); - backpatch_marker = smarks[value]; + if (symbols[value].flags & CHANGE_SFLAG) + { symbols[value].flags &= (~(CHANGE_SFLAG)); + backpatch_marker = symbols[value].marker; if ((backpatch_marker < 0) || (backpatch_marker > LARGEST_BPATCH_MV)) { if (no_link_errors == 0) { compiler_error_named( "Illegal backpatch marker attached to symbol", - (char *) symbs[value]); + symbols[value].name); backpatch_error_flag = TRUE; } } else - svals[value] = backpatch_value_g(svals[value]); + symbols[value].value = backpatch_value_g(symbols[value].value); } - sflags[value] |= USED_SFLAG; - { int t = stypes[value]; - value = svals[value]; + symbols[value].flags |= USED_SFLAG; + { int t = symbols[value].type; + value = symbols[value].value; switch(t) { case ROUTINE_T: @@ -340,7 +344,7 @@ symbol"); break; } - if (asm_trace_level >= 4) printf(" %04x\n", value); + if (bpatch_trace_setting) printf(" %04x\n", value); return(value); } @@ -363,16 +367,14 @@ static void backpatch_zmachine_z(int mv, int zmachine_area, int32 offset) if (mv == ACTION_MV) return; } - /* printf("MV %d ZA %d Off %04x\n", mv, zmachine_area, offset); */ + if (bpatch_trace_setting >= 2) + printf("BP added: MV %d ZA %d Off %04x\n", mv, zmachine_area, offset); - write_byte_to_memory_block(&zmachine_backpatch_table, - zmachine_backpatch_size++, mv); - write_byte_to_memory_block(&zmachine_backpatch_table, - zmachine_backpatch_size++, zmachine_area); - write_byte_to_memory_block(&zmachine_backpatch_table, - zmachine_backpatch_size++, offset/256); - write_byte_to_memory_block(&zmachine_backpatch_table, - zmachine_backpatch_size++, offset%256); + ensure_memory_list_available(&zmachine_backpatch_table_memlist, zmachine_backpatch_size+4); + zmachine_backpatch_table[zmachine_backpatch_size++] = mv; + zmachine_backpatch_table[zmachine_backpatch_size++] = zmachine_area; + zmachine_backpatch_table[zmachine_backpatch_size++] = offset/256; + zmachine_backpatch_table[zmachine_backpatch_size++] = offset%256; } static void backpatch_zmachine_g(int mv, int zmachine_area, int32 offset) @@ -390,20 +392,16 @@ static void backpatch_zmachine_g(int mv, int zmachine_area, int32 offset) Then the four-byte address. */ -/* printf("+MV %d ZA %d Off %06x\n", mv, zmachine_area, offset); */ - - write_byte_to_memory_block(&zmachine_backpatch_table, - zmachine_backpatch_size++, mv); - write_byte_to_memory_block(&zmachine_backpatch_table, - zmachine_backpatch_size++, zmachine_area); - write_byte_to_memory_block(&zmachine_backpatch_table, - zmachine_backpatch_size++, (offset >> 24) & 0xFF); - write_byte_to_memory_block(&zmachine_backpatch_table, - zmachine_backpatch_size++, (offset >> 16) & 0xFF); - write_byte_to_memory_block(&zmachine_backpatch_table, - zmachine_backpatch_size++, (offset >> 8) & 0xFF); - write_byte_to_memory_block(&zmachine_backpatch_table, - zmachine_backpatch_size++, (offset) & 0xFF); + if (bpatch_trace_setting >= 2) + printf("BP added: MV %d ZA %d Off %06x\n", mv, zmachine_area, offset); + + ensure_memory_list_available(&zmachine_backpatch_table_memlist, zmachine_backpatch_size+6); + zmachine_backpatch_table[zmachine_backpatch_size++] = mv; + zmachine_backpatch_table[zmachine_backpatch_size++] = zmachine_area; + zmachine_backpatch_table[zmachine_backpatch_size++] = (offset >> 24) & 0xFF; + zmachine_backpatch_table[zmachine_backpatch_size++] = (offset >> 16) & 0xFF; + zmachine_backpatch_table[zmachine_backpatch_size++] = (offset >> 8) & 0xFF; + zmachine_backpatch_table[zmachine_backpatch_size++] = (offset) & 0xFF; } extern void backpatch_zmachine(int mv, int zmachine_area, int32 offset) @@ -420,12 +418,12 @@ extern void backpatch_zmachine_image_z(void) backpatch_error_flag = FALSE; while (bm < zmachine_backpatch_size) { backpatch_marker - = read_byte_from_memory_block(&zmachine_backpatch_table, bm); + = zmachine_backpatch_table[bm]; zmachine_area - = read_byte_from_memory_block(&zmachine_backpatch_table, bm+1); + = zmachine_backpatch_table[bm+1]; offset - = 256*read_byte_from_memory_block(&zmachine_backpatch_table,bm+2) - + read_byte_from_memory_block(&zmachine_backpatch_table, bm+3); + = 256*zmachine_backpatch_table[bm+2] + + zmachine_backpatch_table[bm+3]; bm += 4; switch(zmachine_area) @@ -462,19 +460,17 @@ extern void backpatch_zmachine_image_g(void) backpatch_error_flag = FALSE; while (bm < zmachine_backpatch_size) { backpatch_marker - = read_byte_from_memory_block(&zmachine_backpatch_table, bm); + = zmachine_backpatch_table[bm]; zmachine_area - = read_byte_from_memory_block(&zmachine_backpatch_table, bm+1); - offset = read_byte_from_memory_block(&zmachine_backpatch_table, bm+2); + = zmachine_backpatch_table[bm+1]; + offset = zmachine_backpatch_table[bm+2]; offset = (offset << 8) | - read_byte_from_memory_block(&zmachine_backpatch_table, bm+3); + zmachine_backpatch_table[bm+3]; offset = (offset << 8) | - read_byte_from_memory_block(&zmachine_backpatch_table, bm+4); + zmachine_backpatch_table[bm+4]; offset = (offset << 8) | - read_byte_from_memory_block(&zmachine_backpatch_table, bm+5); - bm += 6; - - /* printf("-MV %d ZA %d Off %06x\n", backpatch_marker, zmachine_area, offset); */ + zmachine_backpatch_table[bm+5]; + bm += 6; switch(zmachine_area) { case PROP_DEFAULTS_ZA: addr = prop_defaults_offset+4; break; @@ -514,9 +510,9 @@ extern void backpatch_zmachine_image_g(void) /* ------------------------------------------------------------------------- */ extern void init_bpatch_vars(void) -{ initialise_memory_block(&zcode_backpatch_table); - initialise_memory_block(&staticarray_backpatch_table); - initialise_memory_block(&zmachine_backpatch_table); +{ zcode_backpatch_table = NULL; + staticarray_backpatch_table = NULL; + zmachine_backpatch_table = NULL; } extern void bpatch_begin_pass(void) @@ -527,12 +523,21 @@ extern void bpatch_begin_pass(void) extern void bpatch_allocate_arrays(void) { + initialise_memory_list(&zcode_backpatch_table_memlist, + sizeof(uchar), 128, (void**)&zcode_backpatch_table, + "code backpatch table"); + initialise_memory_list(&staticarray_backpatch_table_memlist, + sizeof(uchar), 128, (void**)&staticarray_backpatch_table, + "static array backpatch table"); + initialise_memory_list(&zmachine_backpatch_table_memlist, + sizeof(uchar), 128, (void**)&zmachine_backpatch_table, + "machine backpatch table"); } extern void bpatch_free_arrays(void) -{ deallocate_memory_block(&zcode_backpatch_table); - deallocate_memory_block(&staticarray_backpatch_table); - deallocate_memory_block(&zmachine_backpatch_table); +{ deallocate_memory_list(&zcode_backpatch_table_memlist); + deallocate_memory_list(&staticarray_backpatch_table_memlist); + deallocate_memory_list(&zmachine_backpatch_table_memlist); } /* ========================================================================= */