Skip to content

Commit 3cd352d

Browse files
mniepermnieper
committed
use continuation marks instead of parameterize
1 parent e76d89a commit 3cd352d

File tree

11 files changed

+79
-98
lines changed

11 files changed

+79
-98
lines changed

‎boot/pb/equates.h‎

Lines changed: 45 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,7 +1062,7 @@ typedef uint64_t U64;
10621062
#define size_rp_header 0x20
10631063
#define size_rtd_counts 0x810
10641064
#define size_symbol 0x30
1065-
#define size_tc 0x7E0
1065+
#define size_tc 0x7D0
10661066
#define size_thread 0x10
10671067
#define size_tlc 0x20
10681068
#define size_typed_object 0x10
@@ -1117,8 +1117,8 @@ typedef uint64_t U64;
11171117
#define symbol_pvalue_disp 0xD
11181118
#define symbol_splist_disp 0x25
11191119
#define symbol_value_disp 0x5
1120-
#define tc_DSTBV_disp 0x2C0
1121-
#define tc_SRCBV_disp 0x2C8
1120+
#define tc_DSTBV_disp 0x2B8
1121+
#define tc_SRCBV_disp 0x2C0
11221122
#define tc_U_disp 0x190
11231123
#define tc_V_disp 0x198
11241124
#define tc_W_disp 0x1A0
@@ -1127,46 +1127,45 @@ typedef uint64_t U64;
11271127
#define tc_ac0_disp 0x38
11281128
#define tc_ac1_disp 0x40
11291129
#define tc_active_disp 0x14C
1130-
#define tc_alloc_counter_disp 0x2B0
1130+
#define tc_alloc_counter_disp 0x2A8
11311131
#define tc_ap_disp 0x60
11321132
#define tc_arg_regs_disp 0x0
11331133
#define tc_attachments_disp 0x178
11341134
#define tc_block_counter_disp 0x208
11351135
#define tc_cached_frame_disp 0x188
11361136
#define tc_cchain_disp 0x138
11371137
#define tc_code_ranges_to_flush_disp 0x140
1138-
#define tc_compile_profile_disp 0x248
1139-
#define tc_compress_format_disp 0x290
1140-
#define tc_compress_level_disp 0x298
1138+
#define tc_compile_profile_disp 0x240
1139+
#define tc_compress_format_disp 0x288
1140+
#define tc_compress_level_disp 0x290
11411141
#define tc_cp_disp 0x50
11421142
#define tc_current_error_disp 0x200
11431143
#define tc_current_input_disp 0x1F0
11441144
#define tc_current_mso_disp 0x218
11451145
#define tc_current_output_disp 0x1F8
1146-
#define tc_default_record_equal_procedure_disp 0x280
1147-
#define tc_default_record_hash_procedure_disp 0x288
1146+
#define tc_default_record_equal_procedure_disp 0x278
1147+
#define tc_default_record_hash_procedure_disp 0x280
11481148
#define tc_disable_count_disp 0x1C8
11491149
#define tc_eap_disp 0x68
11501150
#define tc_esp_disp 0x58
1151-
#define tc_expand_time_environment_disp 0x240
1152-
#define tc_fpregs_disp 0x2D0
1151+
#define tc_fpregs_disp 0x2C8
11531152
#define tc_fxfirst_bit_set_bv_disp 0x230
11541153
#define tc_fxlength_bv_disp 0x228
1155-
#define tc_gc_data_disp 0x7D0
1156-
#define tc_generate_inspector_information_disp 0x250
1157-
#define tc_generate_procedure_source_information_disp 0x258
1158-
#define tc_generate_profile_forms_disp 0x260
1154+
#define tc_gc_data_disp 0x7C8
1155+
#define tc_generate_inspector_information_disp 0x248
1156+
#define tc_generate_procedure_source_information_disp 0x250
1157+
#define tc_generate_profile_forms_disp 0x258
11591158
#define tc_guardian_entries_disp 0x130
11601159
#define tc_handler_stack_disp 0x180
1161-
#define tc_instr_counter_disp 0x2A8
1160+
#define tc_instr_counter_disp 0x2A0
11621161
#define tc_keyboard_interrupt_pending_disp 0x1E0
1163-
#define tc_lz4_out_buffer_disp 0x2A0
1162+
#define tc_lz4_out_buffer_disp 0x298
11641163
#define tc_meta_level_disp 0x238
1165-
#define tc_optimize_level_disp 0x268
1166-
#define tc_parameters_disp 0x2B8
1167-
#define tc_pb_call_arena_disp 0x3D0
1168-
#define tc_pb_fpregs_disp 0x390
1169-
#define tc_pb_regs_disp 0x310
1164+
#define tc_optimize_level_disp 0x260
1165+
#define tc_parameters_disp 0x2B0
1166+
#define tc_pb_call_arena_disp 0x3C8
1167+
#define tc_pb_fpregs_disp 0x388
1168+
#define tc_pb_regs_disp 0x308
11701169
#define tc_random_seed_disp 0x148
11711170
#define tc_real_eap_disp 0xA0
11721171
#define tc_ret_disp 0x70
@@ -1180,8 +1179,8 @@ typedef uint64_t U64;
11801179
#define tc_something_pending_disp 0x1B8
11811180
#define tc_stack_cache_disp 0x158
11821181
#define tc_stack_link_disp 0x160
1183-
#define tc_subset_mode_disp 0x270
1184-
#define tc_suppress_primitive_inlining_disp 0x278
1182+
#define tc_subset_mode_disp 0x268
1183+
#define tc_suppress_primitive_inlining_disp 0x270
11851184
#define tc_target_machine_disp 0x220
11861185
#define tc_td_disp 0x98
11871186
#define tc_threadno_disp 0x1E8
@@ -1570,8 +1569,8 @@ typedef uint64_t U64;
15701569
#define THREADTC(x) (*((uptr *)TO_VOIDP((uptr)(x)+9)))
15711570

15721571
/* thread-context data */
1573-
#define DSTBV(x) (*((ptr *)TO_VOIDP((uptr)(x)+704)))
1574-
#define SRCBV(x) (*((ptr *)TO_VOIDP((uptr)(x)+712)))
1572+
#define DSTBV(x) (*((ptr *)TO_VOIDP((uptr)(x)+696)))
1573+
#define SRCBV(x) (*((ptr *)TO_VOIDP((uptr)(x)+704)))
15751574
#define U(x) (*((ptr *)TO_VOIDP((uptr)(x)+400)))
15761575
#define V(x) (*((ptr *)TO_VOIDP((uptr)(x)+408)))
15771576
#define W(x) (*((ptr *)TO_VOIDP((uptr)(x)+416)))
@@ -1580,46 +1579,45 @@ typedef uint64_t U64;
15801579
#define AC0(x) (*((xptr *)TO_VOIDP((uptr)(x)+56)))
15811580
#define AC1(x) (*((xptr *)TO_VOIDP((uptr)(x)+64)))
15821581
#define ACTIVE(x) (*((I32 *)TO_VOIDP((uptr)(x)+332)))
1583-
#define ALLOCCOUNTER(x) (*((U64 *)TO_VOIDP((uptr)(x)+688)))
1582+
#define ALLOCCOUNTER(x) (*((U64 *)TO_VOIDP((uptr)(x)+680)))
15841583
#define AP(x) (*((xptr *)TO_VOIDP((uptr)(x)+96)))
15851584
#define ARGREGS(x,i) (((xptr *)TO_VOIDP((uptr)(x)+0))[i])
15861585
#define ATTACHMENTS(x) (*((ptr *)TO_VOIDP((uptr)(x)+376)))
15871586
#define BLOCKCOUNTER(x) (*((ptr *)TO_VOIDP((uptr)(x)+520)))
15881587
#define CACHEDFRAME(x) (*((ptr *)TO_VOIDP((uptr)(x)+392)))
15891588
#define CCHAIN(x) (*((ptr *)TO_VOIDP((uptr)(x)+312)))
15901589
#define CODERANGESTOFLUSH(x) (*((ptr *)TO_VOIDP((uptr)(x)+320)))
1591-
#define COMPILEPROFILE(x) (*((ptr *)TO_VOIDP((uptr)(x)+584)))
1592-
#define COMPRESSFORMAT(x) (*((ptr *)TO_VOIDP((uptr)(x)+656)))
1593-
#define COMPRESSLEVEL(x) (*((ptr *)TO_VOIDP((uptr)(x)+664)))
1590+
#define COMPILEPROFILE(x) (*((ptr *)TO_VOIDP((uptr)(x)+576)))
1591+
#define COMPRESSFORMAT(x) (*((ptr *)TO_VOIDP((uptr)(x)+648)))
1592+
#define COMPRESSLEVEL(x) (*((ptr *)TO_VOIDP((uptr)(x)+656)))
15941593
#define CP(x) (*((xptr *)TO_VOIDP((uptr)(x)+80)))
15951594
#define CURRENTERROR(x) (*((ptr *)TO_VOIDP((uptr)(x)+512)))
15961595
#define CURRENTINPUT(x) (*((ptr *)TO_VOIDP((uptr)(x)+496)))
15971596
#define CURRENTMSO(x) (*((ptr *)TO_VOIDP((uptr)(x)+536)))
15981597
#define CURRENTOUTPUT(x) (*((ptr *)TO_VOIDP((uptr)(x)+504)))
1599-
#define DEFAULTRECORDEQUALPROCEDURE(x) (*((ptr *)TO_VOIDP((uptr)(x)+640)))
1600-
#define DEFAULTRECORDHASHPROCEDURE(x) (*((ptr *)TO_VOIDP((uptr)(x)+648)))
1598+
#define DEFAULTRECORDEQUALPROCEDURE(x) (*((ptr *)TO_VOIDP((uptr)(x)+632)))
1599+
#define DEFAULTRECORDHASHPROCEDURE(x) (*((ptr *)TO_VOIDP((uptr)(x)+640)))
16011600
#define DISABLECOUNT(x) (*((ptr *)TO_VOIDP((uptr)(x)+456)))
16021601
#define EAP(x) (*((xptr *)TO_VOIDP((uptr)(x)+104)))
16031602
#define ESP(x) (*((xptr *)TO_VOIDP((uptr)(x)+88)))
1604-
#define EXPANDTIMEENVIRONMENT(x) (*((ptr *)TO_VOIDP((uptr)(x)+576)))
1605-
#define FPREGS(x,i) (((double *)TO_VOIDP((uptr)(x)+720))[i])
1603+
#define FPREGS(x,i) (((double *)TO_VOIDP((uptr)(x)+712))[i])
16061604
#define FXFIRSTBITSETBV(x) (*((ptr *)TO_VOIDP((uptr)(x)+560)))
16071605
#define FXLENGTHBV(x) (*((ptr *)TO_VOIDP((uptr)(x)+552)))
1608-
#define GCDATA(x) (*((xptr *)TO_VOIDP((uptr)(x)+2000)))
1609-
#define GENERATEINSPECTORINFORMATION(x) (*((ptr *)TO_VOIDP((uptr)(x)+592)))
1610-
#define GENERATEPROCEDURESOURCEINFORMATION(x) (*((ptr *)TO_VOIDP((uptr)(x)+600)))
1611-
#define GENERATEPROFILEFORMS(x) (*((ptr *)TO_VOIDP((uptr)(x)+608)))
1606+
#define GCDATA(x) (*((xptr *)TO_VOIDP((uptr)(x)+1992)))
1607+
#define GENERATEINSPECTORINFORMATION(x) (*((ptr *)TO_VOIDP((uptr)(x)+584)))
1608+
#define GENERATEPROCEDURESOURCEINFORMATION(x) (*((ptr *)TO_VOIDP((uptr)(x)+592)))
1609+
#define GENERATEPROFILEFORMS(x) (*((ptr *)TO_VOIDP((uptr)(x)+600)))
16121610
#define GUARDIANENTRIES(x) (*((ptr *)TO_VOIDP((uptr)(x)+304)))
16131611
#define HANDLERSTACK(x) (*((ptr *)TO_VOIDP((uptr)(x)+384)))
1614-
#define INSTRCOUNTER(x) (*((U64 *)TO_VOIDP((uptr)(x)+680)))
1612+
#define INSTRCOUNTER(x) (*((U64 *)TO_VOIDP((uptr)(x)+672)))
16151613
#define KEYBOARDINTERRUPTPENDING(x) (*((ptr *)TO_VOIDP((uptr)(x)+480)))
1616-
#define LZ4OUTBUFFER(x) (*((xptr *)TO_VOIDP((uptr)(x)+672)))
1614+
#define LZ4OUTBUFFER(x) (*((xptr *)TO_VOIDP((uptr)(x)+664)))
16171615
#define METALEVEL(x) (*((ptr *)TO_VOIDP((uptr)(x)+568)))
1618-
#define OPTIMIZELEVEL(x) (*((ptr *)TO_VOIDP((uptr)(x)+616)))
1619-
#define PARAMETERS(x) (*((ptr *)TO_VOIDP((uptr)(x)+696)))
1620-
#define PBCALLARENA(x,i) (((uptr *)TO_VOIDP((uptr)(x)+976))[i])
1621-
#define PBFPREGS(x,i) (((double *)TO_VOIDP((uptr)(x)+912))[i])
1622-
#define PBREGS(x,i) (((uptr *)TO_VOIDP((uptr)(x)+784))[i])
1616+
#define OPTIMIZELEVEL(x) (*((ptr *)TO_VOIDP((uptr)(x)+608)))
1617+
#define PARAMETERS(x) (*((ptr *)TO_VOIDP((uptr)(x)+688)))
1618+
#define PBCALLARENA(x,i) (((uptr *)TO_VOIDP((uptr)(x)+968))[i])
1619+
#define PBFPREGS(x,i) (((double *)TO_VOIDP((uptr)(x)+904))[i])
1620+
#define PBREGS(x,i) (((uptr *)TO_VOIDP((uptr)(x)+776))[i])
16231621
#define RANDOMSEED(x) (*((U32 *)TO_VOIDP((uptr)(x)+328)))
16241622
#define REAL_EAP(x) (*((xptr *)TO_VOIDP((uptr)(x)+160)))
16251623
#define RET(x) (*((xptr *)TO_VOIDP((uptr)(x)+112)))
@@ -1633,8 +1631,8 @@ typedef uint64_t U64;
16331631
#define SOMETHINGPENDING(x) (*((ptr *)TO_VOIDP((uptr)(x)+440)))
16341632
#define STACKCACHE(x) (*((ptr *)TO_VOIDP((uptr)(x)+344)))
16351633
#define STACKLINK(x) (*((ptr *)TO_VOIDP((uptr)(x)+352)))
1636-
#define SUBSETMODE(x) (*((ptr *)TO_VOIDP((uptr)(x)+624)))
1637-
#define SUPPRESSPRIMITIVEINLINING(x) (*((ptr *)TO_VOIDP((uptr)(x)+632)))
1634+
#define SUBSETMODE(x) (*((ptr *)TO_VOIDP((uptr)(x)+616)))
1635+
#define SUPPRESSPRIMITIVEINLINING(x) (*((ptr *)TO_VOIDP((uptr)(x)+624)))
16381636
#define TARGETMACHINE(x) (*((ptr *)TO_VOIDP((uptr)(x)+544)))
16391637
#define TD(x) (*((xptr *)TO_VOIDP((uptr)(x)+152)))
16401638
#define THREADNO(x) (*((ptr *)TO_VOIDP((uptr)(x)+488)))

‎boot/pb/gc-ocd.inc‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,6 @@ static void sweep(thread_gc *tgc, ptr p, IGEN from_g)
836836
relocate_pure(&(WINDERS(tc)));
837837
relocate_pure(&(ATTACHMENTS(tc)));
838838
relocate_pure(&(HANDLERSTACK(tc)));
839-
relocate_pure(&(EXPANDTIMEENVIRONMENT(tc)));
840839
CACHEDFRAME(tc) = Sfalse;
841840
{
842841
ptr xcp = FRAME(tc, 0);
@@ -1472,7 +1471,6 @@ static void sweep_object_in_old(thread_gc *tgc, ptr p)
14721471
relocate_pure(&(WINDERS(tc)));
14731472
relocate_pure(&(ATTACHMENTS(tc)));
14741473
relocate_pure(&(HANDLERSTACK(tc)));
1475-
relocate_pure(&(EXPANDTIMEENVIRONMENT(tc)));
14761474
{
14771475
ptr xcp = FRAME(tc, 0);
14781476
{
@@ -2317,7 +2315,6 @@ static void sweep_thread(thread_gc *tgc, ptr p)
23172315
relocate_pure(&(WINDERS(tc)));
23182316
relocate_pure(&(ATTACHMENTS(tc)));
23192317
relocate_pure(&(HANDLERSTACK(tc)));
2320-
relocate_pure(&(EXPANDTIMEENVIRONMENT(tc)));
23212318
CACHEDFRAME(tc) = Sfalse;
23222319
{
23232320
ptr xcp = FRAME(tc, 0);

‎boot/pb/gc-oce.inc‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -958,7 +958,6 @@ static void sweep(thread_gc *tgc, ptr p, IGEN from_g)
958958
relocate_pure(&(WINDERS(tc)));
959959
relocate_pure(&(ATTACHMENTS(tc)));
960960
relocate_pure(&(HANDLERSTACK(tc)));
961-
relocate_pure(&(EXPANDTIMEENVIRONMENT(tc)));
962961
CACHEDFRAME(tc) = Sfalse;
963962
{
964963
ptr xcp = FRAME(tc, 0);
@@ -1595,7 +1594,6 @@ static void sweep_object_in_old(thread_gc *tgc, ptr p)
15951594
relocate_pure(&(WINDERS(tc)));
15961595
relocate_pure(&(ATTACHMENTS(tc)));
15971596
relocate_pure(&(HANDLERSTACK(tc)));
1598-
relocate_pure(&(EXPANDTIMEENVIRONMENT(tc)));
15991597
{
16001598
ptr xcp = FRAME(tc, 0);
16011599
{
@@ -2451,7 +2449,6 @@ static void sweep_thread(thread_gc *tgc, ptr p)
24512449
relocate_pure(&(WINDERS(tc)));
24522450
relocate_pure(&(ATTACHMENTS(tc)));
24532451
relocate_pure(&(HANDLERSTACK(tc)));
2454-
relocate_pure(&(EXPANDTIMEENVIRONMENT(tc)));
24552452
CACHEDFRAME(tc) = Sfalse;
24562453
{
24572454
ptr xcp = FRAME(tc, 0);
@@ -4565,11 +4562,6 @@ static void measure(thread_gc *tgc, ptr p)
45654562
if (!FIXMEDIATE(r_p))
45664563
push_measure(tgc, r_p);
45674564
}
4568-
{ /* measure */
4569-
ptr r_p = EXPANDTIMEENVIRONMENT(tc);
4570-
if (!FIXMEDIATE(r_p))
4571-
push_measure(tgc, r_p);
4572-
}
45734565
{
45744566
ptr xcp = FRAME(tc, 0);
45754567
{

‎boot/pb/gc-par.inc‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,6 @@ static void sweep(thread_gc *tgc, ptr p, IGEN from_g)
830830
relocate_pure(&(WINDERS(tc)));
831831
relocate_pure(&(ATTACHMENTS(tc)));
832832
relocate_pure(&(HANDLERSTACK(tc)));
833-
relocate_pure(&(EXPANDTIMEENVIRONMENT(tc)));
834833
CACHEDFRAME(tc) = Sfalse;
835834
{
836835
ptr xcp = FRAME(tc, 0);
@@ -1476,7 +1475,6 @@ static void sweep_object_in_old(thread_gc *tgc, ptr p)
14761475
relocate_pure(&(WINDERS(tc)));
14771476
relocate_pure(&(ATTACHMENTS(tc)));
14781477
relocate_pure(&(HANDLERSTACK(tc)));
1479-
relocate_pure(&(EXPANDTIMEENVIRONMENT(tc)));
14801478
{
14811479
ptr xcp = FRAME(tc, 0);
14821480
{
@@ -2360,7 +2358,6 @@ static void sweep_thread(thread_gc *tgc, ptr p)
23602358
relocate_pure(&(WINDERS(tc)));
23612359
relocate_pure(&(ATTACHMENTS(tc)));
23622360
relocate_pure(&(HANDLERSTACK(tc)));
2363-
relocate_pure(&(EXPANDTIMEENVIRONMENT(tc)));
23642361
CACHEDFRAME(tc) = Sfalse;
23652362
{
23662363
ptr xcp = FRAME(tc, 0);

‎boot/pb/heapcheck.inc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ static void check_object(ptr p, uptr seg, ISPC s_in, IBOOL aftergc)
247247
check_pointer(&(WINDERS(tc)), 1, 0, p, seg, s_in, aftergc);
248248
check_pointer(&(ATTACHMENTS(tc)), 1, 0, p, seg, s_in, aftergc);
249249
check_pointer(&(HANDLERSTACK(tc)), 1, 0, p, seg, s_in, aftergc);
250-
check_pointer(&(EXPANDTIMEENVIRONMENT(tc)), 1, 0, p, seg, s_in, aftergc);
251250
{
252251
ptr xcp = FRAME(tc, 0);
253252
{

‎boot/pb/petite.boot‎

-7.92 KB
Binary file not shown.

‎boot/pb/scheme.boot‎

-3.92 KB
Binary file not shown.

‎c/thread.c‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/* thread.c
22
* Copyright 1984-2017 Cisco Systems, Inc.
3-
*
3+
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
7-
*
7+
*
88
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
9+
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
1212
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -111,7 +111,7 @@ ptr S_create_thread_object(const char *who, ptr p_tc) {
111111

112112
for (i = 0; i < n; i += 1)
113113
INITVECTIT(v, i) = Svector_ref(p_v, i);
114-
114+
115115
PARAMETERS(tc) = v;
116116
CODERANGESTOFLUSH(tc) = Snil;
117117
}
@@ -182,8 +182,6 @@ ptr S_create_thread_object(const char *who, ptr p_tc) {
182182
if (Sboolean_value(S_symbol_value(S_G.collect_request_pending_id)))
183183
TRAP(tc) = (ptr)1;
184184

185-
EXPANDTIMEENVIRONMENT(tc) = Sfalse;
186-
187185
tc_mutex_release();
188186

189187
return thread;
@@ -318,7 +316,7 @@ static IBOOL destroy_thread(ptr tc) {
318316
free_thread_gcs = THREAD_GC(tc);
319317

320318
free(TO_VOIDP(tc));
321-
319+
322320
THREADTC(thread) = 0; /* mark it dead */
323321
status = 1;
324322

‎s/cmacros.ss‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
;;; Copyright 1984-2017 Cisco Systems, Inc.
2-
;;;
2+
;;;
33
;;; Licensed under the Apache License, Version 2.0 (the "License");
44
;;; you may not use this file except in compliance with the License.
55
;;; You may obtain a copy of the License at
6-
;;;
6+
;;;
77
;;; http://www.apache.org/licenses/LICENSE-2.0
8-
;;;
8+
;;;
99
;;; Unless required by applicable law or agreed to in writing, software
1010
;;; distributed under the License is distributed on an "AS IS" BASIS,
1111
;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -748,7 +748,7 @@
748748
(define-constant max-sweep-space last-swept-value)
749749
(define-constant max-real-space last-unswept-value)
750750
(define-constant max-space last-unreal-value)))))])))
751-
751+
752752
(define-alloc-spaces
753753
(real
754754
(swept
@@ -1636,7 +1636,6 @@
16361636
[ptr fxlength-bv]
16371637
[ptr fxfirst-bit-set-bv]
16381638
[ptr meta-level]
1639-
[ptr expand-time-environment]
16401639
[ptr compile-profile]
16411640
[ptr generate-inspector-information]
16421641
[ptr generate-procedure-source-information]
@@ -2287,12 +2286,12 @@
22872286
(define-primitive-structure-disps vfasl-header type-untyped
22882287
([uptr data-size]
22892288
[uptr table-size]
2290-
2289+
22912290
[uptr result-offset]
2292-
2291+
22932292
;; first starting offset is 0, so skip it in this array:
22942293
[uptr vspace-rel-offsets (constant vspaces-offsets-count)]
2295-
2294+
22962295
[uptr symref-count]
22972296
[uptr rtdref-count]
22982297
[uptr singletonref-count]))
@@ -2770,7 +2769,7 @@
27702769
(make-libspec-flags xindex-base #f xclosure? xinterface xerror? xhas-does-not-expect-headroom-version?)))
27712770
(when xhas-does-not-expect-headroom-version?
27722771
($sputprop xname '*does-not-expect-headroom-libspec*
2773-
(make-libspec xname
2772+
(make-libspec xname
27742773
(make-libspec-flags xindex-base #t xclosure? xinterface xerror? xhas-does-not-expect-headroom-version?)))))
27752774
'(name ...)
27762775
'(index-base ...)
@@ -3267,7 +3266,7 @@
32673266
pb-uint64
32683267
pb-single
32693268
pb-double)
3270-
3269+
32713270
(define-pb-enum pb-move-types
32723271
pb-i->i
32733272
pb-d->d

0 commit comments

Comments
 (0)