commit a21b5bf6d9739c84c358196ba4cefd162090100f
parent 1afa0f003d2bf9bf8c6981f7178dda95900ac9a0
Author: Alexander Burger <abu@software-lab.de>
Date: Sat, 12 Jan 2013 14:28:51 +0100
Fatal bug in 'unwindC_Z' (wrong offset for coroutines)
Diffstat:
6 files changed, 227 insertions(+), 227 deletions(-)
diff --git a/ersatz/picolisp.jar b/ersatz/picolisp.jar
Binary files differ.
diff --git a/src/vers.h b/src/vers.h
@@ -1 +1 @@
-static byte Version[4] = {3,1,1,6};
+static byte Version[4] = {3,1,1,7};
diff --git a/src64/err.l b/src64/err.l
@@ -1,4 +1,4 @@
-# 13oct12abu
+# 12jan13abu
# (c) Software Lab. Alexander Burger
# Debug print routine
@@ -236,28 +236,28 @@
ld Y (C I) # Bind link
loop
do
- cmp (EnvInFrames) (X IV) # Open input frames?
+ cmp (EnvInFrames) (X (pack III "+(EnvInFrames-Env)")) # Open input frames?
while ne # Yes
call popInFiles # Clean up
loop
do
- cmp (EnvOutFrames) (X V) # Open output frames?
+ cmp (EnvOutFrames) (X (pack III "+(EnvOutFrames-Env)")) # Open output frames?
while ne # Yes
call popOutFiles # Clean up
loop
do
- cmp (EnvErrFrames) (X VI) # Open error frames?
+ cmp (EnvErrFrames) (X (pack III "+(EnvErrFrames-Env)")) # Open error frames?
while ne # Yes
call popErrFiles # Clean up
loop
do
- cmp (EnvCtlFrames) (X VII) # Open control frames?
+ cmp (EnvCtlFrames) (X (pack III "+(EnvCtlFrames-Env)")) # Open control frames?
while ne # Yes
call popCtlFiles # Clean up
loop
ld Z (EnvCo7) # Get coroutines
do
- cmp Z (X "EnvCo7-EnvCo") # Skipped?
+ cmp Z (X (pack III "+(EnvCo7-Env)")) # Skipped?
while ne # Yes
ld C (Stack0) # Find stack segment
ld A 1
diff --git a/src64/glob.l b/src64/glob.l
@@ -1,4 +1,4 @@
-# 04jan13abu
+# 12jan13abu
# (c) Software Lab. Alexander Burger
(data 'Data)
@@ -595,10 +595,10 @@
:: OutFile word 0 # Output file
: Env # <Catch III> environment
: EnvBind word 0 # <III> Bind frames (first item in Env)
-: EnvInFrames word 0 # <IV> Input frames
-: EnvOutFrames word 0 # <V> Output frames
-: EnvErrFrames word 0 # <VI> Error frames
-: EnvCtlFrames word 0 # <VII> Control frames
+: EnvInFrames word 0 # Input frames
+: EnvOutFrames word 0 # Output frames
+: EnvErrFrames word 0 # Error frames
+: EnvCtlFrames word 0 # Control frames
:: EnvIntern word pico # Current namespace of internal symbols
: EnvArgs word 0 # Varargs frame
: EnvNext word 0 # Next vararg
diff --git a/src64/tags b/src64/tags
@@ -287,127 +287,127 @@ sys/x86-64.linux.defs.l,1959
Env596,22077
EnvBind597,22110
EnvInFrames598,22183
-EnvOutFrames599,22236
-EnvErrFrames600,22289
-EnvCtlFrames601,22342
-EnvIntern602,22398
-EnvArgs603,22471
-EnvNext604,22520
-EnvCls605,22567
-EnvKey606,22615
-EnvApply607,22661
-EnvMake608,22709
-EnvYoke609,22755
-EnvParseX610,22778
-EnvParseC611,22827
-EnvParseEOF612,22850
-EnvMid613,22874
-EnvCo7614,22902
-EnvTask615,22948
-EnvProtect616,22993
-EnvTrace617,23046
-EnvEnd618,23093
-OrgTermio620,23122
-Flock621,23183
-Tms622,23238
-Addr623,23291
-TBuf625,23351
-CaseBlocks630,23488
-CaseData760,38871
-CaseUpper1097,78752
-CaseLower1121,80578
-Tio1146,82284
-Repl1148,82333
-PRepl1149,82378
-Jam1150,82425
-InBye1151,82470
-Sync1152,82517
-Month1153,82579
-_r_1156,82645
-_w_1157,82662
-_a_1158,82679
-_ap_1159,82696
-_dot_1160,82715
-Giveup1164,82768
-ExecErr1165,82794
-AllocErr1166,82830
-PidSigMsg1167,82859
-QuitMsg1168,82892
-CbErr1169,82913
-HashBlank1171,82957
-Redefined1172,82980
-SuperErr1173,83014
-ExtraErr1174,83043
-ThrowErr1175,83072
-Trc11176,83105
-Trc21177,83123
-SetFD1179,83149
-Delim1180,83174
-DelimEnd1181,83215
-Arrow1182,83226
-RolbLog1184,83253
-IgnLog1185,83314
-CircFree1186,83368
-BadChain1187,83406
-BadCount1188,83435
-ErrTok1190,83472
-Dashes1191,83493
-ProtErr1192,83515
-SymNsErr1193,83550
-StkErr1194,83590
-ArgErr1195,83622
-NumErr1196,83652
-CntErr1197,83685
-SymErr1198,83724
-ExtErr1199,83757
-PairErr1200,83799
-AtomErr1201,83836
-LstErr1202,83868
-VarErr1203,83899
-DivErr1204,83934
-RenErr1205,83957
-MakeErr1206,83987
-ReentErr1207,84016
-YieldErr1208,84055
-MsgErr1209,84087
-BrkErr1210,84116
-OpenErr1211,84142
-CloseErr1212,84175
-PipeErr1213,84210
-ForkErr1214,84243
-WaitPidErr1215,84272
-BadFdErr1216,84302
-NoFdErr1217,84328
-EofErr1218,84360
-SuparErr1219,84389
-BadInput1220,84435
-BadDot1221,84469
-SelectErr1222,84502
-WrBytesErr1223,84539
-WrChildErr1224,84576
-WrSyncErr1225,84613
-WrJnlErr1226,84648
-WrLogErr1227,84685
-TruncErr1228,84718
-DbSyncErr1229,84760
-TrSyncErr1230,84799
-LockErr1231,84847
-DbfErr1232,84879
-JnlErr1233,84908
-IdErr1234,84937
-DbRdErr1235,84960
-DbWrErr1236,84990
-DbSizErr1237,85021
-TellErr1238,85052
-IpSocketErr1239,85084
-IpGetsocknameErr1240,85126
-IpV6onlyErr1241,85178
-IpReuseaddrErr1242,85225
-IpBindErr1243,85276
-IpListenErr1244,85314
-UdpOvflErr1245,85356
-UndefErr1246,85390
-DlErr1247,85419
+EnvOutFrames599,22231
+EnvErrFrames600,22280
+EnvCtlFrames601,22328
+EnvIntern602,22378
+EnvArgs603,22451
+EnvNext604,22500
+EnvCls605,22547
+EnvKey606,22595
+EnvApply607,22641
+EnvMake608,22689
+EnvYoke609,22735
+EnvParseX610,22758
+EnvParseC611,22807
+EnvParseEOF612,22830
+EnvMid613,22854
+EnvCo7614,22882
+EnvTask615,22928
+EnvProtect616,22973
+EnvTrace617,23026
+EnvEnd618,23073
+OrgTermio620,23102
+Flock621,23163
+Tms622,23218
+Addr623,23271
+TBuf625,23331
+CaseBlocks630,23468
+CaseData760,38851
+CaseUpper1097,78732
+CaseLower1121,80558
+Tio1146,82264
+Repl1148,82313
+PRepl1149,82358
+Jam1150,82405
+InBye1151,82450
+Sync1152,82497
+Month1153,82559
+_r_1156,82625
+_w_1157,82642
+_a_1158,82659
+_ap_1159,82676
+_dot_1160,82695
+Giveup1164,82748
+ExecErr1165,82774
+AllocErr1166,82810
+PidSigMsg1167,82839
+QuitMsg1168,82872
+CbErr1169,82893
+HashBlank1171,82937
+Redefined1172,82960
+SuperErr1173,82994
+ExtraErr1174,83023
+ThrowErr1175,83052
+Trc11176,83085
+Trc21177,83103
+SetFD1179,83129
+Delim1180,83154
+DelimEnd1181,83195
+Arrow1182,83206
+RolbLog1184,83233
+IgnLog1185,83294
+CircFree1186,83348
+BadChain1187,83386
+BadCount1188,83415
+ErrTok1190,83452
+Dashes1191,83473
+ProtErr1192,83495
+SymNsErr1193,83530
+StkErr1194,83570
+ArgErr1195,83602
+NumErr1196,83632
+CntErr1197,83665
+SymErr1198,83704
+ExtErr1199,83737
+PairErr1200,83779
+AtomErr1201,83816
+LstErr1202,83848
+VarErr1203,83879
+DivErr1204,83914
+RenErr1205,83937
+MakeErr1206,83967
+ReentErr1207,83996
+YieldErr1208,84035
+MsgErr1209,84067
+BrkErr1210,84096
+OpenErr1211,84122
+CloseErr1212,84155
+PipeErr1213,84190
+ForkErr1214,84223
+WaitPidErr1215,84252
+BadFdErr1216,84282
+NoFdErr1217,84308
+EofErr1218,84340
+SuparErr1219,84369
+BadInput1220,84415
+BadDot1221,84449
+SelectErr1222,84482
+WrBytesErr1223,84519
+WrChildErr1224,84556
+WrSyncErr1225,84593
+WrJnlErr1226,84628
+WrLogErr1227,84665
+TruncErr1228,84698
+DbSyncErr1229,84740
+TrSyncErr1230,84779
+LockErr1231,84827
+DbfErr1232,84859
+JnlErr1233,84888
+IdErr1234,84917
+DbRdErr1235,84940
+DbWrErr1236,84970
+DbSizErr1237,85001
+TellErr1238,85032
+IpSocketErr1239,85064
+IpGetsocknameErr1240,85106
+IpV6onlyErr1241,85158
+IpReuseaddrErr1242,85205
+IpBindErr1243,85256
+IpListenErr1244,85294
+UdpOvflErr1245,85336
+UndefErr1246,85370
+DlErr1247,85399
./main.l,2244
Code4,51
@@ -747,102 +747,102 @@ sys/x86-64.linux.defs.l,1959
fishAXY1640,41196
doBy1669,41750
-./err.l,1921
+./err.l,1923
dbgS5,73
errnoEXY24,572
errEXYZ33,734
unwindC_Z171,4381
-needSymAX329,8742
-needSymEX341,8941
-needVarAX352,9130
-needVarEX362,9307
-checkVarAX371,9474
-checkVarYX379,9610
-checkVarEX387,9746
-protErrEX392,9854
-symNsErrEX396,9904
-stkErr401,9979
-stkErrE403,10004
-stkErrX405,10030
-stkErrEX407,10056
-argErrAX412,10144
-argErrEX414,10171
-numErrAX418,10219
-numErrEX420,10246
-cntErrAX424,10294
-cntErrCX426,10321
-cntErrEX428,10348
-symErrAX432,10396
-symErrYX434,10423
-symErrEX436,10450
-extErrEX440,10498
-pairErrAX444,10546
-pairErrEX446,10574
-atomErrAX450,10624
-atomErrEX452,10652
-lstErrAX456,10702
-lstErrEX458,10729
-varErrAX462,10777
-varErrEX464,10804
-divErrX468,10852
-renErrEX473,10909
-makeErrX477,10957
-reentErrEX482,11016
-yieldErrX486,11068
-yieldErrEX488,11096
-msgErrYX492,11148
-msgErrAX494,11175
-msgErrEX496,11202
-brkErrX500,11250
-openErrEX506,11320
-closeErrX510,11371
-closeErrEX512,11399
-pipeErrX516,11452
-forkErrX521,11512
-waitPidErrX526,11571
-badFdErrEX531,11637
-noFdErrX535,11689
-eofErr540,11748
-suparErrE546,11814
-badInputErrB551,11875
-badDotErrE559,11966
-selectErrX564,12026
-wrBytesErr569,12090
-wrChildErr575,12165
-wrSyncErrX581,12240
-wrJnlErr586,12304
-wrLogErr592,12375
-truncErrX598,12446
-dbSyncErrX603,12508
-trSyncErrX608,12572
-lockErr613,12636
-dbfErrX619,12705
-jnlErrX624,12762
-idErrXL629,12819
-dbRdErr634,12893
-dbWrErr640,12962
-dbSizErr646,13031
-tellErr652,13101
-ipSocketErrX658,13169
-ipGetsocknameErrX663,13237
-ipV6onlyErrX668,13315
-ipReuseaddrErrX673,13383
-ipBindErrX678,13457
-ipListenErrX683,13521
-udpOvflErr688,13589
-undefinedCE695,13688
-undefinedCX697,13718
-undefinedEX699,13748
-dlErrX703,13801
-ret711,13947
-retc713,13968
-retnc716,13998
-retz719,14029
-retnz722,14059
-retNull725,14090
-retNil728,14125
-retT731,14161
-retE_E734,14196
+needSymAX329,8873
+needSymEX341,9072
+needVarAX352,9261
+needVarEX362,9438
+checkVarAX371,9605
+checkVarYX379,9741
+checkVarEX387,9877
+protErrEX392,9985
+symNsErrEX396,10035
+stkErr401,10110
+stkErrE403,10135
+stkErrX405,10161
+stkErrEX407,10187
+argErrAX412,10275
+argErrEX414,10302
+numErrAX418,10350
+numErrEX420,10377
+cntErrAX424,10425
+cntErrCX426,10452
+cntErrEX428,10479
+symErrAX432,10527
+symErrYX434,10554
+symErrEX436,10581
+extErrEX440,10629
+pairErrAX444,10677
+pairErrEX446,10705
+atomErrAX450,10755
+atomErrEX452,10783
+lstErrAX456,10833
+lstErrEX458,10860
+varErrAX462,10908
+varErrEX464,10935
+divErrX468,10983
+renErrEX473,11040
+makeErrX477,11088
+reentErrEX482,11147
+yieldErrX486,11199
+yieldErrEX488,11227
+msgErrYX492,11279
+msgErrAX494,11306
+msgErrEX496,11333
+brkErrX500,11381
+openErrEX506,11451
+closeErrX510,11502
+closeErrEX512,11530
+pipeErrX516,11583
+forkErrX521,11643
+waitPidErrX526,11702
+badFdErrEX531,11768
+noFdErrX535,11820
+eofErr540,11879
+suparErrE546,11945
+badInputErrB551,12006
+badDotErrE559,12097
+selectErrX564,12157
+wrBytesErr569,12221
+wrChildErr575,12296
+wrSyncErrX581,12371
+wrJnlErr586,12435
+wrLogErr592,12506
+truncErrX598,12577
+dbSyncErrX603,12639
+trSyncErrX608,12703
+lockErr613,12767
+dbfErrX619,12836
+jnlErrX624,12893
+idErrXL629,12950
+dbRdErr634,13024
+dbWrErr640,13093
+dbSizErr646,13162
+tellErr652,13232
+ipSocketErrX658,13300
+ipGetsocknameErrX663,13368
+ipV6onlyErrX668,13446
+ipReuseaddrErrX673,13514
+ipBindErrX678,13588
+ipListenErrX683,13652
+udpOvflErr688,13720
+undefinedCE695,13819
+undefinedCX697,13849
+undefinedEX699,13879
+dlErrX703,13932
+ret711,14078
+retc713,14099
+retnc716,14129
+retz719,14160
+retnz722,14190
+retNull725,14221
+retNil728,14256
+retT731,14292
+retE_E734,14327
./sym.l,1776
cmpLongAX_F5,78
diff --git a/src64/version.l b/src64/version.l
@@ -1,6 +1,6 @@
-# 07jan13abu
+# 12jan13abu
# (c) Software Lab. Alexander Burger
-(de *Version 3 1 1 6)
+(de *Version 3 1 1 7)
# vi:et:ts=3:sw=3
