Author: leo
Date: Wed Oct 5 09:57:51 2005
New Revision: 9360
Removed:
trunk/docs/dev/rx.dev
trunk/include/parrot/rx.h
trunk/include/parrot/rxstacks.h
trunk/ops/rx.ops
trunk/src/rx.c
trunk/src/rxstacks.c
trunk/t/op/rx.t
Modified:
trunk/DEPRECATED
trunk/MANIFEST
trunk/PBC_COMPAT
trunk/config/gen/makefiles/root.in
trunk/include/parrot/interpreter.h
trunk/ops/ops.num
trunk/ops/stack.ops
trunk/src/inter_create.c
trunk/t/examples/japh.t
trunk/t/native_pbc/integer_1.pbc
trunk/t/native_pbc/integer_2.pbc
trunk/t/native_pbc/integer_3.pbc
trunk/t/native_pbc/integer_4.pbc
trunk/t/native_pbc/number_1.pbc
trunk/t/native_pbc/number_2.pbc
trunk/t/native_pbc/number_3.pbc
trunk/t/native_pbc/number_4.pbc
trunk/t/native_pbc/number_5.pbc
trunk/t/native_pbc/string_1.pbc
trunk/t/native_pbc/string_2.pbc
trunk/t/op/stacks.t
Log:
Deprecated 6 - remove rx opcodes, intstack, and related stuff
* deleted files:
src/rxstacks.c src/rx.c docs/dev/rx.dev ops/rx.ops
include/parrot/rx.h include/parrot/rxstacks.h t/op/rx.t
* remove intstack from context and interp create/destruct
* remove rx includes
* rx_ ops are deleted from ops.num, which caused ops renumbering and:
* update PBC_COMPAT
This version of Parrot can't read older PBCs please:
$ make realclean
$ find . -name '*.pbc' | xargs rm
Conversion hints:
intstack => ResizableIntegerPMC
rx_ ops => PGE
Modified: trunk/DEPRECATED
==============================================================================
--- trunk/DEPRECATED (original)
+++ trunk/DEPRECATED Wed Oct 5 09:57:51 2005
@@ -21,15 +21,6 @@ savetop, restoretop,
use saveall/restoreall (whole register frame) or
user stack opcodes save/restore instead.
-Integer stack opcodes
-
-intsave/intrestore/intdepth
-
- The integer stack was an invention for rx_ opcodes, but as it's a
- global stack, regexen using these opcodes aren't reentrant.
-
- use a ResizableIntegerPMC instead and standard keyed access
-
String character class opcodes is_* find_* and API interfaces
The opcodes C<is_digit>, C<find_digit> et al and the according APIs are
@@ -40,14 +31,6 @@ C<pack> opcodes
I've no clue what these are doing - for sure not a perl-ish pack.
-rx_ opcodes, src/rx.c, and the intstack
-
- The old rx_ (regex) opcodes are unused by PGE (and will not be used).
- The opcodes are lacking state, rx code using these ops is not reentrant
- due to the global intstack.
- rx.c has yet another (ascii-only) character class handling, it leaks
- memory and is just broken.
-
FUTURE changes
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST (original)
+++ trunk/MANIFEST Wed Oct 5 09:57:51 2005
@@ -326,7 +326,6 @@ docs/dev/longopt.dev
docs/dev/optimizer.pod [main]doc
docs/dev/nanoparrot.c [main]doc
docs/dev/pmc_freeze.pod [devel]doc
-docs/dev/rx.dev [main]doc
docs/embed.pod [main]doc
docs/extend.pod [main]doc
docs/faq.pod [main]doc
@@ -775,8 +774,6 @@ include/parrot/regfuncs.h
include/parrot/register.h [devel]include
include/parrot/resources.h [devel]include
include/parrot/runops_cores.h [devel]include
-include/parrot/rx.h [devel]include
-include/parrot/rxstacks.h [devel]include
include/parrot/settings.h [devel]include
include/parrot/slice.h [devel]include
include/parrot/smallobject.h [devel]include
@@ -1692,7 +1689,6 @@ ops/ops.num
ops/pic.ops []
ops/pmc.ops []
ops/python.ops []
-ops/rx.ops []
ops/set.ops []
ops/stack.ops []
ops/string.ops []
@@ -1773,8 +1769,6 @@ src/register.c
src/res_lea.c []
src/resources.c []
src/runops_cores.c []
-src/rx.c []
-src/rxstacks.c []
src/smallobject.c []
src/spf_render.c []
src/spf_vtable.c []
@@ -1842,7 +1836,6 @@ t/op/literal.t
t/op/macro.t []
t/op/number.t []
t/op/random.t []
-t/op/rx.t []
t/op/spawnw.t []
t/op/stacks.t []
t/op/string.t []
Modified: trunk/PBC_COMPAT
==============================================================================
--- trunk/PBC_COMPAT (original)
+++ trunk/PBC_COMPAT Wed Oct 5 09:57:51 2005
@@ -24,6 +24,7 @@
# please insert tab separated entries at the top of the list
+2005.10.05 leo deleted rx_ opcodes
2005.10.01 leo 0.3.0 release
2005.08.05 leo 0.2.3 release
2005.07.03 leo 0.2.2 release; add fixedintegerarray.freeze
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in (original)
+++ trunk/config/gen/makefiles/root.in Wed Oct 5 09:57:51 2005
@@ -391,8 +391,6 @@ INTERP_O_FILES = \
$(SRC_DIR)/core_pmcs$(O) \
#CONDITIONED_LINE(platform_asm): $(SRC_DIR)/platform_asm$(O) \
$(SRC_DIR)/platform$(O) ${TEMP_jit_o} \
- $(SRC_DIR)/rx$(O) \
- $(SRC_DIR)/rxstacks$(O) \
$(SRC_DIR)/intlist$(O) \
$(SRC_DIR)/list$(O) \
$(SRC_DIR)/library$(O) \
@@ -1001,10 +999,6 @@ $(SRC_DIR)/register$(O) : $(GENERAL_H_FI
$(SRC_DIR)/runops_cores$(O) : $(GENERAL_H_FILES)
-$(SRC_DIR)/rx$(O) : $(GENERAL_H_FILES)
-
-$(SRC_DIR)/rxstacks$(O) : $(GENERAL_H_FILES)
-
$(SRC_DIR)/stacks$(O) : $(GENERAL_H_FILES)
$(SRC_DIR)/stack_common$(O) : $(GENERAL_H_FILES)
Modified: trunk/include/parrot/interpreter.h
==============================================================================
--- trunk/include/parrot/interpreter.h (original)
+++ trunk/include/parrot/interpreter.h Wed Oct 5 09:57:51 2005
@@ -106,8 +106,6 @@ typedef Parrot_Run_core_t Run_Cores;
#include "parrot/op.h"
#include "parrot/oplib.h"
-#include "parrot/rxstacks.h"
-
#include "parrot/debug.h"
#include "parrot/mmd.h"
@@ -191,7 +189,6 @@ struct Parrot_Context {
struct Stack_Chunk *pad_stack; /* Base of the lex pad stack */
struct Stack_Chunk *user_stack; /* Base of the scratch stack */
struct Stack_Chunk *control_stack; /* Base of the flow control stack */
- IntStack intstack; /* Base of the regex stack */
UINTVAL warns; /* Keeps track of what warnings
* have been activated */
UINTVAL errors; /* fatals that can be turned off */
Modified: trunk/ops/ops.num
==============================================================================
--- trunk/ops/ops.num (original)
+++ trunk/ops/ops.num Wed Oct 5 09:57:51 2005
@@ -385,8 +385,8 @@ find_method_p_p_s 354
find_method_p_p_sc 355
find_type_i_s 356
find_type_i_sc 357
-DELETED_findclass_i_s 358
-DELETED_findclass_i_sc 359
+DELETED_findclass_i_s 358
+DELETED_findclass_i_sc 359
floor_i_n 360
floor_i_nc 361
floor_n 362
@@ -461,15 +461,15 @@ index_i_sc_s_ic 430
index_i_sc_sc 431
index_i_sc_sc_i 432
index_i_sc_sc_ic 433
-intdepth_i 434
+DELETED_intdepth_i 434
interpinfo_i_i 435
interpinfo_i_ic 436
interpinfo_p_i 437
interpinfo_p_ic 438
-intrestore_i 439
-intsave_i 440
-intsave_ic 441
-DELETED_invoke 442
+DELETED_intrestore_i 439
+DELETED_intsave_i 440
+DELETED_intsave_ic 441
+DELETED_invoke 442
invoke_p_p 443
yield 444
invokecc_p 445
@@ -523,9 +523,9 @@ isntsame_i_s_s 492
isntsame_i_s_sc 493
isntsame_i_sc_s 494
isntsame_i_sc_sc 495
-DELETED_isnull_p_ic 496
-DELETED_isnull_s_ic 497
-DELETED_isnull_sc_ic 498
+DELETED_isnull_p_ic 496
+DELETED_isnull_s_ic 497
+DELETED_isnull_sc_ic 498
issame_i_p_p 499
issame_i_s_s 500
issame_i_s_sc 501
@@ -857,496 +857,434 @@ rotate_up_i 826
rotate_up_ic 827
runinterp_p_i 828
runinterp_p_ic 829
-rx_advance_s_i_ic 830
-rx_advance_sc_i_ic 831
-rx_char_all_s_i_i 832
-rx_char_all_s_i_ic 833
-rx_char_all_sc_i_i 834
-rx_char_all_sc_i_ic 835
-rx_char_s_i_i_ic 836
-rx_char_s_i_ic_ic 837
-rx_char_sc_i_i_ic 838
-rx_char_sc_i_ic_ic 839
-rx_clearstack 840
-rx_compile_s_s_s 841
-rx_compile_s_s_sc 842
-rx_compile_s_sc_s 843
-rx_compile_s_sc_sc 844
-rx_dot_s_i_ic 845
-rx_dot_sc_i_ic 846
-rx_initstack 847
-rx_is_d_s_i_ic 848
-rx_is_d_sc_i_ic 849
-rx_is_s_s_i_ic 850
-rx_is_s_sc_i_ic 851
-rx_is_w_s_i_ic 852
-rx_is_w_sc_i_ic 853
-rx_literal_all_s_i_s 854
-rx_literal_all_s_i_sc 855
-rx_literal_all_sc_i_s 856
-rx_literal_all_sc_i_sc 857
-rx_literal_s_i_s_ic 858
-rx_literal_s_i_sc_ic 859
-rx_literal_sc_i_s_ic 860
-rx_literal_sc_i_sc_ic 861
-rx_makebmp_p_s 862
-rx_makebmp_p_sc 863
-rx_oneof_bmp_all_s_i_p 864
-rx_oneof_bmp_all_sc_i_p 865
-rx_oneof_bmp_s_i_p_ic 866
-rx_oneof_bmp_sc_i_p_ic 867
-rx_oneof_s_i_s_ic 868
-rx_oneof_s_i_sc_ic 869
-rx_oneof_sc_i_s_ic 870
-rx_oneof_sc_i_sc_ic 871
-rx_popindex_i_ic 872
-rx_pushindex_i 873
-rx_pushindex_ic 874
-rx_pushmark 875
-rx_search_char_s_i_i_i_ic 876
-rx_search_char_s_i_i_ic_ic 877
-rx_search_char_sc_i_i_i_ic 878
-rx_search_char_sc_i_i_ic_ic 879
-rx_search_s_i_i_s_ic 880
-rx_search_s_i_i_sc_ic 881
-rx_search_sc_i_i_s_ic 882
-rx_search_sc_i_i_sc_ic 883
-rx_zwa_atend_s_i_ic 884
-rx_zwa_atend_s_ic_ic 885
-rx_zwa_atend_sc_i_ic 886
-rx_zwa_atend_sc_ic_ic 887
-rx_zwa_boundary_s_i_ic 888
-rx_zwa_boundary_s_ic_ic 889
-rx_zwa_boundary_sc_i_ic 890
-rx_zwa_boundary_sc_ic_ic 891
-save_i 892
-save_ic 893
-save_n 894
-save_nc 895
-save_p 896
-save_s 897
-save_sc 898
-saveall 899
-savec_s 900
-savec_sc 901
-savetop 902
-sec_n_n 903
-sec_n_nc 904
-sech_n_n 905
-sech_n_nc 906
-seek_p_i_i 907
-seek_p_i_i_i 908
-seek_p_i_i_ic 909
-seek_p_i_ic 910
-seek_p_i_ic_i 911
-seek_p_i_ic_ic 912
-seek_p_ic_i 913
-seek_p_ic_i_i 914
-seek_p_ic_i_ic 915
-seek_p_ic_ic 916
-seek_p_ic_ic_i 917
-seek_p_ic_ic_ic 918
-send_i_p_s 919
-send_i_p_sc 920
-set_addr_i_ic 921
-set_addr_p_i 922
-set_addr_p_ic 923
-set_i_i 924
-set_i_ic 925
-set_i_n 926
-set_i_nc 927
-set_i_p 928
-set_i_p_k 929
-set_i_p_kc 930
-set_i_p_ki 931
-set_i_p_kic 932
-set_i_s 933
-set_i_sc 934
-set_n_i 935
-set_n_ic 936
-set_n_n 937
-set_n_nc 938
-set_n_p 939
-set_n_p_k 940
-set_n_p_kc 941
-set_n_p_ki 942
-set_n_p_kic 943
-set_n_s 944
-set_n_sc 945
-set_p_i 946
-set_p_ic 947
-set_p_k_i 948
-set_p_k_ic 949
-set_p_k_n 950
-set_p_k_nc 951
-set_p_k_p 952
-set_p_k_s 953
-set_p_k_sc 954
-set_p_kc_i 955
-set_p_kc_ic 956
-set_p_kc_n 957
-set_p_kc_nc 958
-set_p_kc_p 959
-set_p_kc_s 960
-set_p_kc_sc 961
-set_p_ki_i 962
-set_p_ki_ic 963
-set_p_ki_n 964
-set_p_ki_nc 965
-set_p_ki_p 966
-set_p_ki_s 967
-set_p_ki_sc 968
-set_p_kic_i 969
-set_p_kic_ic 970
-set_p_kic_n 971
-set_p_kic_nc 972
-set_p_kic_p 973
-set_p_kic_s 974
-set_p_kic_sc 975
-set_p_n 976
-set_p_nc 977
-set_p_p 978
-set_p_p_k 979
-set_p_p_kc 980
-set_p_p_ki 981
-set_p_p_kic 982
-set_p_pc 983
-set_p_s 984
-set_p_sc 985
-set_s_i 986
-set_s_ic 987
-set_s_n 988
-set_s_nc 989
-set_s_p 990
-set_s_p_k 991
-set_s_p_kc 992
-set_s_p_ki 993
-set_s_p_kic 994
-set_s_s 995
-set_s_sc 996
-setattribute_p_i_p 997
-setattribute_p_ic_p 998
-setattribute_p_s_p 999
-setattribute_p_sc_p 1000
-setfile_s 1001
-setfile_sc 1002
-seti_ind_i_i 1003
-seti_ind_i_ic 1004
-seti_ind_ic_i 1005
-seti_ind_ic_ic 1006
-setline_i 1007
-setline_ic 1008
-setn_ind_i_n 1009
-setn_ind_i_nc 1010
-setn_ind_ic_n 1011
-setn_ind_ic_nc 1012
-setp_ind_i_p 1013
-setp_ind_ic_p 1014
-setpackage_s 1015
-setpackage_sc 1016
-setprop_p_s_p 1017
-setprop_p_sc_p 1018
-setref_p_p 1019
-sets_ind_i_s 1020
-sets_ind_i_sc 1021
-sets_ind_ic_s 1022
-sets_ind_ic_sc 1023
-shift_i_p 1024
-shift_n_p 1025
-shift_p_p 1026
-shift_s_p 1027
-shl_i_i 1028
-shl_i_i_i 1029
-shl_i_i_ic 1030
-shl_i_ic 1031
-shl_i_ic_i 1032
-shr_i_i 1033
-shr_i_i_i 1034
-shr_i_i_ic 1035
-shr_i_ic 1036
-shr_i_ic_i 1037
-sin_n_n 1038
-sin_n_nc 1039
-singleton_p 1040
-sinh_n_n 1041
-sinh_n_nc 1042
-sizeof_i_i 1043
-sizeof_i_ic 1044
-sleep_i 1045
-sleep_ic 1046
-sleep_n 1047
-sleep_nc 1048
-sockaddr_s_i_s 1049
-sockaddr_s_i_sc 1050
-sockaddr_s_ic_s 1051
-sockaddr_s_ic_sc 1052
-socket_p_i_i_i 1053
-socket_p_i_i_ic 1054
-socket_p_i_ic_i 1055
-socket_p_i_ic_ic 1056
-socket_p_ic_i_i 1057
-socket_p_ic_i_ic 1058
-socket_p_ic_ic_i 1059
-socket_p_ic_ic_ic 1060
-spawnw_i_s 1061
-spawnw_i_sc 1062
-splice_p_p_i_i 1063
-splice_p_p_i_ic 1064
-splice_p_p_ic_i 1065
-splice_p_p_ic_ic 1066
-split_p_s_s 1067
-split_p_s_sc 1068
-split_p_sc_s 1069
-split_p_sc_sc 1070
-sprintf_p_p_p 1071
-sprintf_s_s_p 1072
-sprintf_s_sc_p 1073
-sqrt_n_n 1074
-stat_i_i_i 1075
-stat_i_i_ic 1076
-stat_i_ic_i 1077
-stat_i_ic_ic 1078
-stat_i_s_i 1079
-stat_i_s_ic 1080
-stat_i_sc_i 1081
-stat_i_sc_ic 1082
-store_global_p_s_p 1083
-store_global_p_sc_p 1084
-store_global_s_p 1085
-store_global_s_s_p 1086
-store_global_s_sc_p 1087
-store_global_sc_p 1088
-store_global_sc_s_p 1089
-store_global_sc_sc_p 1090
-store_lex_i_i_p 1091
-store_lex_i_ic_p 1092
-store_lex_i_s_p 1093
-store_lex_i_sc_p 1094
-store_lex_ic_i_p 1095
-store_lex_ic_ic_p 1096
-store_lex_ic_s_p 1097
-store_lex_ic_sc_p 1098
-store_lex_s_p 1099
-store_lex_sc_p 1100
-stringinfo_i_s_i 1101
-stringinfo_i_s_ic 1102
-stringinfo_i_sc_i 1103
-stringinfo_i_sc_ic 1104
-sub_i_i 1105
-sub_i_i_i 1106
-sub_i_i_ic 1107
-sub_i_ic 1108
-sub_i_ic_i 1109
-sub_n_n 1110
-sub_n_n_n 1111
-sub_n_n_nc 1112
-sub_n_nc 1113
-sub_n_nc_n 1114
-subclass_p_p 1115
-subclass_p_p_s 1116
-subclass_p_p_sc 1117
-subclass_p_s 1118
-subclass_p_s_s 1119
-subclass_p_s_sc 1120
-subclass_p_sc 1121
-subclass_p_sc_s 1122
-subclass_p_sc_sc 1123
-substr_r_s_s_i_i 1124
-substr_r_s_s_i_ic 1125
-substr_r_s_s_ic_i 1126
-substr_r_s_s_ic_ic 1127
-substr_r_s_sc_i_i 1128
-substr_r_s_sc_i_ic 1129
-substr_r_s_sc_ic_i 1130
-substr_r_s_sc_ic_ic 1131
-substr_s_i_i_s 1132
-substr_s_i_i_sc 1133
-substr_s_i_ic_s 1134
-substr_s_i_ic_sc 1135
-substr_s_ic_i_s 1136
-substr_s_ic_i_sc 1137
-substr_s_ic_ic_s 1138
-substr_s_ic_ic_sc 1139
-substr_s_p_i_i 1140
-substr_s_p_i_ic 1141
-substr_s_p_ic_i 1142
-substr_s_p_ic_ic 1143
-substr_s_s_i 1144
-substr_s_s_i_i 1145
-substr_s_s_i_i_s 1146
-substr_s_s_i_i_sc 1147
-substr_s_s_i_ic 1148
-substr_s_s_i_ic_s 1149
-substr_s_s_i_ic_sc 1150
-substr_s_s_ic 1151
-substr_s_s_ic_i 1152
-substr_s_s_ic_i_s 1153
-substr_s_s_ic_i_sc 1154
-substr_s_s_ic_ic 1155
-substr_s_s_ic_ic_s 1156
-substr_s_s_ic_ic_sc 1157
-substr_s_sc_i 1158
-substr_s_sc_i_i 1159
-substr_s_sc_i_ic 1160
-substr_s_sc_ic 1161
-substr_s_sc_ic_i 1162
-substr_s_sc_ic_ic 1163
-sweep_ic 1164
-sweepoff 1165
-sweepon 1166
-sysinfo_i_i 1167
-sysinfo_i_ic 1168
-sysinfo_s_i 1169
-sysinfo_s_ic 1170
-tailcall_p 1171
-tailcallmethod_p_s 1172
-tailcallmethod_p_sc 1173
-tan_n_n 1174
-tan_n_nc 1175
-tanh_n_n 1176
-tanh_n_nc 1177
-tell_i_i_p 1178
-tell_i_p 1179
-thaw_p_s 1180
-thaw_p_sc 1181
-throw_p 1182
-time_i 1183
-time_n 1184
-titlecase_s 1185
-titlecase_s_s 1186
-titlecase_s_sc 1187
-trace_i 1188
-trace_ic 1189
-typeof_i_p 1190
-typeof_i_p_k 1191
-typeof_i_p_kc 1192
-typeof_i_p_ki 1193
-typeof_i_p_kic 1194
-typeof_s_i 1195
-typeof_s_ic 1196
-typeof_s_p 1197
-unless_i_ic 1198
-unless_n_ic 1199
-unless_p_ic 1200
-unless_s_ic 1201
-unpin_s 1202
-unregister_p 1203
-unshift_p_i 1204
-unshift_p_ic 1205
-unshift_p_n 1206
-unshift_p_nc 1207
-unshift_p_p 1208
-unshift_p_s 1209
-unshift_p_sc 1210
-upcase_s 1211
-upcase_s_s 1212
-upcase_s_sc 1213
-DELETED_updatecc 1214
-valid_type_i_i 1215
-valid_type_i_ic 1216
-warningsoff_i 1217
-warningsoff_ic 1218
-warningson_i 1219
-warningson_ic 1220
-write_p 1221
-xor_i_i_i 1222
-xor_i_i_ic 1223
-xor_i_ic_i 1224
-pushaction_p 1225
-popmark_i 1226
-popmark_ic 1227
-pushmark_i 1228
-pushmark_ic 1229
-new_p_sc 1230
-pop_pad_p 1231
-interpinfo_s_i 1232
-interpinfo_s_ic 1233
-bind_i_p_s 1234
-bind_i_p_sc 1235
-listen_i_p_i 1236
-listen_i_p_ic 1237
-accept_p_p 1238
-charset_i_s 1239
-charset_i_sc 1240
-charsetname_s_i 1241
-charsetname_s_ic 1242
-find_charset_i_s 1243
-find_charset_i_sc 1244
-is_whitespace_i_s_i 1245
-is_whitespace_i_s_ic 1246
-is_whitespace_i_sc_i 1247
-is_whitespace_i_sc_ic 1248
-is_digit_i_s_i 1249
-is_digit_i_s_ic 1250
-is_digit_i_sc_i 1251
-is_digit_i_sc_ic 1252
-is_wordchar_i_s_i 1253
-is_wordchar_i_s_ic 1254
-is_wordchar_i_sc_i 1255
-is_wordchar_i_sc_ic 1256
-is_punctuation_i_s_i 1257
-is_punctuation_i_s_ic 1258
-is_punctuation_i_sc_i 1259
-is_punctuation_i_sc_ic 1260
-is_newline_i_s_i 1261
-is_newline_i_s_ic 1262
-is_newline_i_sc_i 1263
-is_newline_i_sc_ic 1264
-find_whitespace_i_s_i 1265
-find_whitespace_i_s_ic 1266
-find_whitespace_i_sc_i 1267
-find_whitespace_i_sc_ic 1268
-find_digit_i_s_i 1269
-find_digit_i_s_ic 1270
-find_digit_i_sc_i 1271
-find_digit_i_sc_ic 1272
-find_wordchar_i_s_i 1273
-find_wordchar_i_s_ic 1274
-find_wordchar_i_sc_i 1275
-find_wordchar_i_sc_ic 1276
-find_punctuation_i_s_i 1277
-find_punctuation_i_s_ic 1278
-find_punctuation_i_sc_i 1279
-find_punctuation_i_sc_ic 1280
-find_newline_i_s_i 1281
-find_newline_i_s_ic 1282
-find_newline_i_sc_i 1283
-find_newline_i_sc_ic 1284
-find_word_boundary_i_s_i 1285
-find_word_boundary_i_s_ic 1286
-find_word_boundary_i_sc_i 1287
-find_word_boundary_i_sc_ic 1288
-trans_charset_s_i 1289
-trans_charset_s_ic 1290
-trans_charset_s_s_i 1291
-trans_charset_s_s_ic 1292
-trans_charset_s_sc_i 1293
-trans_charset_s_sc_ic 1294
-bytelength_i_s 1295
-bytelength_i_sc 1296
-get_mro_p_p 1297
-find_name_p_s 1298
-find_name_p_sc 1299
-backtrace 1300
-pic_infix___ic_p_p 1301
-pic_inline_sub___ic_p_p 1302
-n_abs_p_p 1303
-n_neg_p_p 1304
-bnot_i 1305
-bnot_p 1306
-n_bnot_p_p 1307
-bnots_s 1308
-bnots_p 1309
-n_bnots_p_p 1310
-not_i 1311
-not_p 1312
-n_not_p_p 1313
-spawnw_i_p 1314
-rot_i_i_i_ic 1315
-rot_i_ic_i_ic 1316
-rot_i_i_ic_ic 1317
-new_p_i_s 1318
-new_p_ic_s 1319
-new_p_i_sc 1320
-new_p_ic_sc 1321
-tailcallmethod_p_p 1322
+save_i 830
+save_ic 831
+save_n 832
+save_nc 833
+save_p 834
+save_s 835
+save_sc 836
+saveall 837
+savec_s 838
+savec_sc 839
+savetop 840
+sec_n_n 841
+sec_n_nc 842
+sech_n_n 843
+sech_n_nc 844
+seek_p_i_i 845
+seek_p_i_i_i 846
+seek_p_i_i_ic 847
+seek_p_i_ic 848
+seek_p_i_ic_i 849
+seek_p_i_ic_ic 850
+seek_p_ic_i 851
+seek_p_ic_i_i 852
+seek_p_ic_i_ic 853
+seek_p_ic_ic 854
+seek_p_ic_ic_i 855
+seek_p_ic_ic_ic 856
+send_i_p_s 857
+send_i_p_sc 858
+set_addr_i_ic 859
+set_addr_p_i 860
+set_addr_p_ic 861
+set_i_i 862
+set_i_ic 863
+set_i_n 864
+set_i_nc 865
+set_i_p 866
+set_i_p_k 867
+set_i_p_kc 868
+set_i_p_ki 869
+set_i_p_kic 870
+set_i_s 871
+set_i_sc 872
+set_n_i 873
+set_n_ic 874
+set_n_n 875
+set_n_nc 876
+set_n_p 877
+set_n_p_k 878
+set_n_p_kc 879
+set_n_p_ki 880
+set_n_p_kic 881
+set_n_s 882
+set_n_sc 883
+set_p_i 884
+set_p_ic 885
+set_p_k_i 886
+set_p_k_ic 887
+set_p_k_n 888
+set_p_k_nc 889
+set_p_k_p 890
+set_p_k_s 891
+set_p_k_sc 892
+set_p_kc_i 893
+set_p_kc_ic 894
+set_p_kc_n 895
+set_p_kc_nc 896
+set_p_kc_p 897
+set_p_kc_s 898
+set_p_kc_sc 899
+set_p_ki_i 900
+set_p_ki_ic 901
+set_p_ki_n 902
+set_p_ki_nc 903
+set_p_ki_p 904
+set_p_ki_s 905
+set_p_ki_sc 906
+set_p_kic_i 907
+set_p_kic_ic 908
+set_p_kic_n 909
+set_p_kic_nc 910
+set_p_kic_p 911
+set_p_kic_s 912
+set_p_kic_sc 913
+set_p_n 914
+set_p_nc 915
+set_p_p 916
+set_p_p_k 917
+set_p_p_kc 918
+set_p_p_ki 919
+set_p_p_kic 920
+set_p_pc 921
+set_p_s 922
+set_p_sc 923
+set_s_i 924
+set_s_ic 925
+set_s_n 926
+set_s_nc 927
+set_s_p 928
+set_s_p_k 929
+set_s_p_kc 930
+set_s_p_ki 931
+set_s_p_kic 932
+set_s_s 933
+set_s_sc 934
+setattribute_p_i_p 935
+setattribute_p_ic_p 936
+setattribute_p_s_p 937
+setattribute_p_sc_p 938
+setfile_s 939
+setfile_sc 940
+seti_ind_i_i 941
+seti_ind_i_ic 942
+seti_ind_ic_i 943
+seti_ind_ic_ic 944
+setline_i 945
+setline_ic 946
+setn_ind_i_n 947
+setn_ind_i_nc 948
+setn_ind_ic_n 949
+setn_ind_ic_nc 950
+setp_ind_i_p 951
+setp_ind_ic_p 952
+setpackage_s 953
+setpackage_sc 954
+setprop_p_s_p 955
+setprop_p_sc_p 956
+setref_p_p 957
+sets_ind_i_s 958
+sets_ind_i_sc 959
+sets_ind_ic_s 960
+sets_ind_ic_sc 961
+shift_i_p 962
+shift_n_p 963
+shift_p_p 964
+shift_s_p 965
+shl_i_i 966
+shl_i_i_i 967
+shl_i_i_ic 968
+shl_i_ic 969
+shl_i_ic_i 970
+shr_i_i 971
+shr_i_i_i 972
+shr_i_i_ic 973
+shr_i_ic 974
+shr_i_ic_i 975
+sin_n_n 976
+sin_n_nc 977
+singleton_p 978
+sinh_n_n 979
+sinh_n_nc 980
+sizeof_i_i 981
+sizeof_i_ic 982
+sleep_i 983
+sleep_ic 984
+sleep_n 985
+sleep_nc 986
+sockaddr_s_i_s 987
+sockaddr_s_i_sc 988
+sockaddr_s_ic_s 989
+sockaddr_s_ic_sc 990
+socket_p_i_i_i 991
+socket_p_i_i_ic 992
+socket_p_i_ic_i 993
+socket_p_i_ic_ic 994
+socket_p_ic_i_i 995
+socket_p_ic_i_ic 996
+socket_p_ic_ic_i 997
+socket_p_ic_ic_ic 998
+spawnw_i_s 999
+spawnw_i_sc 1000
+splice_p_p_i_i 1001
+splice_p_p_i_ic 1002
+splice_p_p_ic_i 1003
+splice_p_p_ic_ic 1004
+split_p_s_s 1005
+split_p_s_sc 1006
+split_p_sc_s 1007
+split_p_sc_sc 1008
+sprintf_p_p_p 1009
+sprintf_s_s_p 1010
+sprintf_s_sc_p 1011
+sqrt_n_n 1012
+stat_i_i_i 1013
+stat_i_i_ic 1014
+stat_i_ic_i 1015
+stat_i_ic_ic 1016
+stat_i_s_i 1017
+stat_i_s_ic 1018
+stat_i_sc_i 1019
+stat_i_sc_ic 1020
+store_global_p_s_p 1021
+store_global_p_sc_p 1022
+store_global_s_p 1023
+store_global_s_s_p 1024
+store_global_s_sc_p 1025
+store_global_sc_p 1026
+store_global_sc_s_p 1027
+store_global_sc_sc_p 1028
+store_lex_i_i_p 1029
+store_lex_i_ic_p 1030
+store_lex_i_s_p 1031
+store_lex_i_sc_p 1032
+store_lex_ic_i_p 1033
+store_lex_ic_ic_p 1034
+store_lex_ic_s_p 1035
+store_lex_ic_sc_p 1036
+store_lex_s_p 1037
+store_lex_sc_p 1038
+stringinfo_i_s_i 1039
+stringinfo_i_s_ic 1040
+stringinfo_i_sc_i 1041
+stringinfo_i_sc_ic 1042
+sub_i_i 1043
+sub_i_i_i 1044
+sub_i_i_ic 1045
+sub_i_ic 1046
+sub_i_ic_i 1047
+sub_n_n 1048
+sub_n_n_n 1049
+sub_n_n_nc 1050
+sub_n_nc 1051
+sub_n_nc_n 1052
+subclass_p_p 1053
+subclass_p_p_s 1054
+subclass_p_p_sc 1055
+subclass_p_s 1056
+subclass_p_s_s 1057
+subclass_p_s_sc 1058
+subclass_p_sc 1059
+subclass_p_sc_s 1060
+subclass_p_sc_sc 1061
+substr_r_s_s_i_i 1062
+substr_r_s_s_i_ic 1063
+substr_r_s_s_ic_i 1064
+substr_r_s_s_ic_ic 1065
+substr_r_s_sc_i_i 1066
+substr_r_s_sc_i_ic 1067
+substr_r_s_sc_ic_i 1068
+substr_r_s_sc_ic_ic 1069
+substr_s_i_i_s 1070
+substr_s_i_i_sc 1071
+substr_s_i_ic_s 1072
+substr_s_i_ic_sc 1073
+substr_s_ic_i_s 1074
+substr_s_ic_i_sc 1075
+substr_s_ic_ic_s 1076
+substr_s_ic_ic_sc 1077
+substr_s_p_i_i 1078
+substr_s_p_i_ic 1079
+substr_s_p_ic_i 1080
+substr_s_p_ic_ic 1081
+substr_s_s_i 1082
+substr_s_s_i_i 1083
+substr_s_s_i_i_s 1084
+substr_s_s_i_i_sc 1085
+substr_s_s_i_ic 1086
+substr_s_s_i_ic_s 1087
+substr_s_s_i_ic_sc 1088
+substr_s_s_ic 1089
+substr_s_s_ic_i 1090
+substr_s_s_ic_i_s 1091
+substr_s_s_ic_i_sc 1092
+substr_s_s_ic_ic 1093
+substr_s_s_ic_ic_s 1094
+substr_s_s_ic_ic_sc 1095
+substr_s_sc_i 1096
+substr_s_sc_i_i 1097
+substr_s_sc_i_ic 1098
+substr_s_sc_ic 1099
+substr_s_sc_ic_i 1100
+substr_s_sc_ic_ic 1101
+sweep_ic 1102
+sweepoff 1103
+sweepon 1104
+sysinfo_i_i 1105
+sysinfo_i_ic 1106
+sysinfo_s_i 1107
+sysinfo_s_ic 1108
+tailcall_p 1109
+tailcallmethod_p_s 1110
+tailcallmethod_p_sc 1111
+tan_n_n 1112
+tan_n_nc 1113
+tanh_n_n 1114
+tanh_n_nc 1115
+tell_i_i_p 1116
+tell_i_p 1117
+thaw_p_s 1118
+thaw_p_sc 1119
+throw_p 1120
+time_i 1121
+time_n 1122
+titlecase_s 1123
+titlecase_s_s 1124
+titlecase_s_sc 1125
+trace_i 1126
+trace_ic 1127
+typeof_i_p 1128
+typeof_i_p_k 1129
+typeof_i_p_kc 1130
+typeof_i_p_ki 1131
+typeof_i_p_kic 1132
+typeof_s_i 1133
+typeof_s_ic 1134
+typeof_s_p 1135
+unless_i_ic 1136
+unless_n_ic 1137
+unless_p_ic 1138
+unless_s_ic 1139
+unpin_s 1140
+unregister_p 1141
+unshift_p_i 1142
+unshift_p_ic 1143
+unshift_p_n 1144
+unshift_p_nc 1145
+unshift_p_p 1146
+unshift_p_s 1147
+unshift_p_sc 1148
+upcase_s 1149
+upcase_s_s 1150
+upcase_s_sc 1151
+DELETED_updatecc 1152
+valid_type_i_i 1153
+valid_type_i_ic 1154
+warningsoff_i 1155
+warningsoff_ic 1156
+warningson_i 1157
+warningson_ic 1158
+write_p 1159
+xor_i_i_i 1160
+xor_i_i_ic 1161
+xor_i_ic_i 1162
+pushaction_p 1163
+popmark_i 1164
+popmark_ic 1165
+pushmark_i 1166
+pushmark_ic 1167
+new_p_sc 1168
+pop_pad_p 1169
+interpinfo_s_i 1170
+interpinfo_s_ic 1171
+bind_i_p_s 1172
+bind_i_p_sc 1173
+listen_i_p_i 1174
+listen_i_p_ic 1175
+accept_p_p 1176
+charset_i_s 1177
+charset_i_sc 1178
+charsetname_s_i 1179
+charsetname_s_ic 1180
+find_charset_i_s 1181
+find_charset_i_sc 1182
+is_whitespace_i_s_i 1183
+is_whitespace_i_s_ic 1184
+is_whitespace_i_sc_i 1185
+is_whitespace_i_sc_ic 1186
+is_digit_i_s_i 1187
+is_digit_i_s_ic 1188
+is_digit_i_sc_i 1189
+is_digit_i_sc_ic 1190
+is_wordchar_i_s_i 1191
+is_wordchar_i_s_ic 1192
+is_wordchar_i_sc_i 1193
+is_wordchar_i_sc_ic 1194
+is_punctuation_i_s_i 1195
+is_punctuation_i_s_ic 1196
+is_punctuation_i_sc_i 1197
+is_punctuation_i_sc_ic 1198
+is_newline_i_s_i 1199
+is_newline_i_s_ic 1200
+is_newline_i_sc_i 1201
+is_newline_i_sc_ic 1202
+find_whitespace_i_s_i 1203
+find_whitespace_i_s_ic 1204
+find_whitespace_i_sc_i 1205
+find_whitespace_i_sc_ic 1206
+find_digit_i_s_i 1207
+find_digit_i_s_ic 1208
+find_digit_i_sc_i 1209
+find_digit_i_sc_ic 1210
+find_wordchar_i_s_i 1211
+find_wordchar_i_s_ic 1212
+find_wordchar_i_sc_i 1213
+find_wordchar_i_sc_ic 1214
+find_punctuation_i_s_i 1215
+find_punctuation_i_s_ic 1216
+find_punctuation_i_sc_i 1217
+find_punctuation_i_sc_ic 1218
+find_newline_i_s_i 1219
+find_newline_i_s_ic 1220
+find_newline_i_sc_i 1221
+find_newline_i_sc_ic 1222
+find_word_boundary_i_s_i 1223
+find_word_boundary_i_s_ic 1224
+find_word_boundary_i_sc_i 1225
+find_word_boundary_i_sc_ic 1226
+trans_charset_s_i 1227
+trans_charset_s_ic 1228
+trans_charset_s_s_i 1229
+trans_charset_s_s_ic 1230
+trans_charset_s_sc_i 1231
+trans_charset_s_sc_ic 1232
+bytelength_i_s 1233
+bytelength_i_sc 1234
+get_mro_p_p 1235
+find_name_p_s 1236
+find_name_p_sc 1237
+backtrace 1238
+pic_infix___ic_p_p 1239
+pic_inline_sub___ic_p_p 1240
+n_abs_p_p 1241
+n_neg_p_p 1242
+bnot_i 1243
+bnot_p 1244
+n_bnot_p_p 1245
+bnots_s 1246
+bnots_p 1247
+n_bnots_p_p 1248
+not_i 1249
+not_p 1250
+n_not_p_p 1251
+spawnw_i_p 1252
+rot_i_i_i_ic 1253
+rot_i_ic_i_ic 1254
+rot_i_i_ic_ic 1255
+new_p_i_s 1256
+new_p_ic_s 1257
+new_p_i_sc 1258
+new_p_ic_sc 1259
+tailcallmethod_p_p 1260
Modified: trunk/ops/stack.ops
==============================================================================
--- trunk/ops/stack.ops (original)
+++ trunk/ops/stack.ops Wed Oct 5 09:57:51 2005
@@ -569,42 +569,16 @@ inline op rotate_up(in INT) :base_core {
goto NEXT();
}
-########################################
-
-=item B<intsave>(in INT)
-
-Save register or constant $1 onto the high-speed int stack.
-
-=cut
-
-inline op intsave(in INT) :base_core {
- intstack_push(interpreter, CONTEXT(interpreter->ctx)->intstack, $1);
+inline op DELETED_intsave(in INT) :base_core {
goto NEXT();
}
-########################################
-
-=item B<intrestore>(out INT)
-
-Restore register $1 from the high-speed int stack.
-=cut
-
-inline op intrestore(out INT) :base_core {
- $1=intstack_pop(interpreter, CONTEXT(interpreter->ctx)->intstack);
+inline op DELETED_intrestore(out INT) :base_core {
goto NEXT();
}
-########################################
-
-=item B<intdepth>(out INT)
-
-Puts the depth of the high-speed int stack in $1.
-
-=cut
-
-inline op intdepth(out INT) :base_core {
- $1=intstack_depth(interpreter, CONTEXT(interpreter->ctx)->intstack);
+inline op DELETED_intdepth(out INT) :base_core {
goto NEXT();
}
Modified: trunk/src/inter_create.c
==============================================================================
--- trunk/src/inter_create.c (original)
+++ trunk/src/inter_create.c Wed Oct 5 09:57:51 2005
@@ -561,9 +561,6 @@ make_interpreter(Parrot_Interp parent, I
/* And a control stack */
CONTEXT(interpreter->ctx)->control_stack = new_stack(interpreter,
"Control");
- /* A regex stack would be nice too. */
- CONTEXT(interpreter->ctx)->intstack = intstack_new(interpreter);
-
/* clear context introspection vars */
SET_NULL_P(CONTEXT(interpreter->ctx)->current_sub, PMC*);
SET_NULL_P(CONTEXT(interpreter->ctx)->current_cont, PMC*);
@@ -770,8 +767,6 @@ Parrot_really_destroy(int exit_code, voi
stack_destroy(CONTEXT(interpreter->ctx)->pad_stack);
stack_destroy(CONTEXT(interpreter->ctx)->user_stack);
stack_destroy(CONTEXT(interpreter->ctx)->control_stack);
- /* intstack */
- intstack_free(interpreter, CONTEXT(interpreter->ctx)->intstack);
destroy_context(interpreter);
Modified: trunk/t/examples/japh.t
==============================================================================
--- trunk/t/examples/japh.t (original)
+++ trunk/t/examples/japh.t Wed Oct 5 09:57:51 2005
@@ -39,9 +39,10 @@ my %todo = map { $_ => 'various reasons'
# known reasons for failure
$todo{8} = 'works only on little endian';
$todo{13} = 'unreliable, but often succeeds';
+# all others: opcode renumbered
# working tests
-undef $todo{$_} foreach ( 3, 12 );
+undef $todo{$_} foreach ( 12 );
# run all tests and tell about todoness
foreach ( 1 .. 15 ) {
Modified: trunk/t/native_pbc/integer_1.pbc
==============================================================================
Binary files. No diff available.
Modified: trunk/t/native_pbc/integer_2.pbc
==============================================================================
Binary files. No diff available.
Modified: trunk/t/native_pbc/integer_3.pbc
==============================================================================
Binary files. No diff available.
Modified: trunk/t/native_pbc/integer_4.pbc
==============================================================================
Binary files. No diff available.
Modified: trunk/t/native_pbc/number_1.pbc
==============================================================================
Binary files. No diff available.
Modified: trunk/t/native_pbc/number_2.pbc
==============================================================================
Binary files. No diff available.
Modified: trunk/t/native_pbc/number_3.pbc
==============================================================================
Binary files. No diff available.
Modified: trunk/t/native_pbc/number_4.pbc
==============================================================================
Binary files. No diff available.
Modified: trunk/t/native_pbc/number_5.pbc
==============================================================================
Binary files. No diff available.
Modified: trunk/t/native_pbc/string_1.pbc
==============================================================================
Binary files. No diff available.
Modified: trunk/t/native_pbc/string_2.pbc
==============================================================================
Binary files. No diff available.
Modified: trunk/t/op/stacks.t
==============================================================================
--- trunk/t/op/stacks.t (original)
+++ trunk/t/op/stacks.t Wed Oct 5 09:57:51 2005
@@ -17,7 +17,7 @@ where C<*> is not C<p>.
=cut
-use Parrot::Test tests => 56;
+use Parrot::Test tests => 53;
use Test::More;
# Tests for stack operations, currently push*, push_*_c and pop*
@@ -1089,85 +1089,6 @@ LOOP: save I1
print I0
print "\n"
- end
-CODE
-0
-1
-1024
-OUTPUT
-
-output_is(<<'CODE', <<'OUTPUT', "intstack");
- intsave -1
- intsave 0
- intsave 1
- intsave 2
- intsave 3
- set I0, 4
- intsave I0
-
- intrestore I1
- print I1
-
- intrestore I1
- print I1
-
- intrestore I1
- print I1
-
- intrestore I1
- print I1
-
- intrestore I1
- print I1
-
- intrestore I1
- print I1
-
- print "\n"
- end
-CODE
-43210-1
-OUTPUT
-
-output_is(<<'CODE', <<'OUTPUT', "intstack stress test");
- set I0, 0
-LOOP: intsave I0
- inc I0
- lt I0, 2048, LOOP
-
-LOOP2: dec I0
- intrestore I1
- ne I0, I1, ERROR
- gt I0, 0, LOOP2
- print "ok\n"
- end
-
-ERROR: print "Not ok\n"
- end
-
-CODE
-ok
-OUTPUT
-
-output_is(<<'CODE', <<'OUTPUT', "intdepth");
- intdepth I0
- print I0
- print "\n"
-
- intsave 1
- intdepth I0
- print I0
- print "\n"
- intrestore I2
-
- set I1, 0
-LOOP: intsave I1
- inc I1
- lt I1, 1024, LOOP
- intdepth I0
- print I0
- print "\n"
-
end
CODE
0
