Front page | perl.cvs.parrot |
Postings from December 2008
[svn:parrot] r34289 - in branches/remove_pic: . compilers/imcc config/gen/makefiles include/parrot src src/ops src/pmc
From:
coke
Date:
December 23, 2008 13:18
Subject:
[svn:parrot] r34289 - in branches/remove_pic: . compilers/imcc config/gen/makefiles include/parrot src src/ops src/pmc
Message ID:
20081223211804.809B1CBA12@x12.develooper.com
Author: coke
Date: Tue Dec 23 13:18:02 2008
New Revision: 34289
Removed:
branches/remove_pic/include/parrot/pic.h
branches/remove_pic/src/ops/pic.ops
branches/remove_pic/src/pic.c
branches/remove_pic/src/pic_jit.c
Modified:
branches/remove_pic/DEPRECATED.pod
branches/remove_pic/MANIFEST
branches/remove_pic/PBC_COMPAT
branches/remove_pic/compilers/imcc/pbc.c
branches/remove_pic/config/gen/makefiles/root.in
branches/remove_pic/include/parrot/packfile.h
branches/remove_pic/include/parrot/parrot.h
branches/remove_pic/src/ops/ops.num
branches/remove_pic/src/packfile.c
branches/remove_pic/src/pbc_merge.c
branches/remove_pic/src/pmc/eval.pmc
Log:
First machete hack at removing PIC. 5 failures in 'make test':
t/pmc/packfile (Wstat: 512 Tests: 11 Failed: 2)
Failed tests: 7, 9
t/run/options (Wstat: 768 Tests: 26 Failed: 3)
Failed tests: 22-24
Modified: branches/remove_pic/DEPRECATED.pod
==============================================================================
--- branches/remove_pic/DEPRECATED.pod (original)
+++ branches/remove_pic/DEPRECATED.pod Tue Dec 23 13:18:02 2008
@@ -130,13 +130,6 @@
See RT #60626.
-=item src/pic.c and src/pic_jit.c [post 0.8.1]
-
-These two files were a thin prototype implementation of Polymorphic Inline
-Caching that only ever applied to 4 opcodes, one of which has now been removed.
-The files (and all functions in them) are deprecated, and will be removed. See
-RT #60048.
-
=item * Subs marked with C<:vtable>/C<:method> aren't in namespace [post 0.8.2]
Subs marked with C<:vtable> or C<:method> flags are no longer given a
Modified: branches/remove_pic/MANIFEST
==============================================================================
--- branches/remove_pic/MANIFEST (original)
+++ branches/remove_pic/MANIFEST Tue Dec 23 13:18:02 2008
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Tue Dec 23 20:12:10 2008 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Tue Dec 23 20:59:52 2008 UT
#
# See tools/dev/install_files.pl for documentation on the
# format of this file.
@@ -931,7 +931,6 @@
include/parrot/oplib.h [main]include
include/parrot/packfile.h [main]include
include/parrot/parrot.h [main]include
-include/parrot/pic.h [main]include
include/parrot/pmc.h [main]include
include/parrot/pmc_freeze.h [main]include
include/parrot/pobj.h [main]include
@@ -3020,7 +3019,6 @@
src/ops/obscure.ops []
src/ops/ops.num [devel]
src/ops/ops.skip []
-src/ops/pic.ops []
src/ops/pmc.ops []
src/ops/set.ops []
src/ops/stm.ops []
@@ -3036,8 +3034,6 @@
src/pbc_info.c []
src/pbc_merge.c []
src/pdump.c []
-src/pic.c []
-src/pic_jit.c []
src/pmc.c []
src/pmc/addrregistry.pmc []
src/pmc/array.pmc []
Modified: branches/remove_pic/PBC_COMPAT
==============================================================================
--- branches/remove_pic/PBC_COMPAT (original)
+++ branches/remove_pic/PBC_COMPAT Tue Dec 23 13:18:02 2008
@@ -26,7 +26,8 @@
# Also, if you're removing an opcode, be sure to run "make opsrenumber"
# please insert tab separated entries at the top of the list
-
+
+3.26 2008.12.23 coke removed pic.ops
3.25 2008.11.15 tewk changed size of Parrot_sub structure which effects frozen sub pmc size
3.24 2008.11.24 pmichaud added capture_lex opcode
3.23 2008.11.15 chromatic added box opcodes
Modified: branches/remove_pic/compilers/imcc/pbc.c
==============================================================================
--- branches/remove_pic/compilers/imcc/pbc.c (original)
+++ branches/remove_pic/compilers/imcc/pbc.c Tue Dec 23 13:18:02 2008
@@ -1964,21 +1964,11 @@
constant_folding(interp, unit);
store_sub_size(interp, code_size, ins_size);
- /*
- * allocate code and pic_index
- *
- * pic_index is half the size of the code, as one PIC-cachable opcode
- * is at least two opcodes wide - see below how to further decrease
- * this storage
- */
+ /*allocate code */
interp->code->base.data = (opcode_t *)
mem_sys_realloc(interp->code->base.data, bytes);
- interp->code->pic_index->data = (opcode_t *)
- mem_sys_realloc(interp->code->pic_index->data, bytes / 2);
-
interp->code->base.size = oldsize + code_size;
- interp->code->pic_index->size = (oldsize + code_size) / 2;
IMCC_INFO(interp)->pc = (opcode_t *)interp->code->base.data + oldsize;
IMCC_INFO(interp)->npc = 0;
@@ -2059,21 +2049,6 @@
op = (opcode_t)ins->opnum;
- /* add PIC idx */
- if (parrot_PIC_op_is_cached(op)) {
- const size_t offs = IMCC_INFO(interp)->pc - interp->code->base.data;
- /*
- * for pic_idx fitting into a short, we could
- * further reduce the size by storing shorts
- * the relation code_size / pic_index_size could
- * indicate the used storage
- *
- * drawback: if we reach 0xffff, we'd have to resize again
- */
- interp->code->pic_index->data[offs / 2] =
- ++IMCC_INFO(interp)->globals->cs->pic_idx;
- }
-
/* Start generating the bytecode */
*(IMCC_INFO(interp)->pc)++ = op;
Modified: branches/remove_pic/config/gen/makefiles/root.in
==============================================================================
--- branches/remove_pic/config/gen/makefiles/root.in (original)
+++ branches/remove_pic/config/gen/makefiles/root.in Tue Dec 23 13:18:02 2008
@@ -411,8 +411,6 @@
$(SRC_DIR)/oo$(O) \
$(SRC_DIR)/packfile$(O) \
$(SRC_DIR)/packout$(O) \
- $(SRC_DIR)/pic_jit$(O) \
- $(SRC_DIR)/pic$(O) \
$(SRC_DIR)/platform$(O) \
$(SRC_DIR)/pmc_freeze$(O) \
$(SRC_DIR)/pmc$(O) \
@@ -1152,10 +1150,6 @@
$(SRC_DIR)/main$(O) : $(SRC_DIR)/main.c $(GENERAL_H_FILES)
-$(SRC_DIR)/pic$(O) : $(GENERAL_H_FILES)
-
-$(SRC_DIR)/pic_jit$(O) : $(GENERAL_H_FILES)
-
$(SRC_DIR)/multidispatch$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/multidispatch.str
$(SRC_DIR)/packfile$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/packfile.str
Modified: branches/remove_pic/include/parrot/packfile.h
==============================================================================
--- branches/remove_pic/include/parrot/packfile.h (original)
+++ branches/remove_pic/include/parrot/packfile.h Tue Dec 23 13:18:02 2008
@@ -199,8 +199,6 @@
PackFile_Segment base;
Prederef prederef; /* The predereferenced code and info */
struct Parrot_jit_info_t *jit_info; /* JITs data */
- Parrot_PIC_store *pic_store; /* PIC storage */
- PackFile_Segment *pic_index; /* segment of indices into store */
struct PackFile_Debug *debugs;
PackFile_ConstTable *const_table;
PackFile_FixupTable *fixups;
Modified: branches/remove_pic/include/parrot/parrot.h
==============================================================================
--- branches/remove_pic/include/parrot/parrot.h (original)
+++ branches/remove_pic/include/parrot/parrot.h Tue Dec 23 13:18:02 2008
@@ -290,7 +290,6 @@
#include "parrot/exceptions.h"
#include "parrot/warnings.h"
#include "parrot/memory.h"
-#include "parrot/pic.h"
#include "parrot/packfile.h"
#include "parrot/io.h"
#include "parrot/op.h"
Modified: branches/remove_pic/src/ops/ops.num
==============================================================================
--- branches/remove_pic/src/ops/ops.num (original)
+++ branches/remove_pic/src/ops/ops.num Tue Dec 23 13:18:02 2008
@@ -827,485 +827,480 @@
inspect_p_pc_s 797
inspect_p_p_sc 798
inspect_p_pc_sc 799
-pic_infix___ic_p_p 800
-pic_inline_sub___ic_p_p 801
-pic_get_params___pc 802
-pic_set_returns___pc 803
-pic_callr___pc 804
-new_p_s 805
-new_p_sc 806
-new_p_s_p 807
-new_p_sc_p 808
-new_p_s_pc 809
-new_p_sc_pc 810
-new_p_p 811
-new_p_pc 812
-new_p_p_p 813
-new_p_pc_p 814
-new_p_p_pc 815
-new_p_pc_pc 816
-typeof_s_p 817
-typeof_p_p 818
-get_repr_s_p 819
-find_method_p_p_s 820
-find_method_p_p_sc 821
-defined_i_p 822
-defined_i_p_ki 823
-defined_i_p_kic 824
-defined_i_p_k 825
-defined_i_p_kc 826
-exists_i_p_ki 827
-exists_i_p_kic 828
-exists_i_p_k 829
-exists_i_p_kc 830
-delete_p_k 831
-delete_p_kc 832
-delete_p_ki 833
-delete_p_kic 834
-elements_i_p 835
-push_p_i 836
-push_p_ic 837
-push_p_n 838
-push_p_nc 839
-push_p_s 840
-push_p_sc 841
-push_p_p 842
-pop_i_p 843
-pop_n_p 844
-pop_s_p 845
-pop_p_p 846
-unshift_p_i 847
-unshift_p_ic 848
-unshift_p_n 849
-unshift_p_nc 850
-unshift_p_s 851
-unshift_p_sc 852
-unshift_p_p 853
-shift_i_p 854
-shift_n_p 855
-shift_s_p 856
-shift_p_p 857
-setprop_p_s_p 858
-setprop_p_sc_p 859
-getprop_p_s_p 860
-getprop_p_sc_p 861
-delprop_p_s 862
-delprop_p_sc 863
-prophash_p_p 864
-freeze_s_p 865
-thaw_p_s 866
-thaw_p_sc 867
-add_multi_s_s_p 868
-add_multi_sc_s_p 869
-add_multi_s_sc_p 870
-add_multi_sc_sc_p 871
-find_multi_p_s_s 872
-find_multi_p_sc_s 873
-find_multi_p_s_sc 874
-find_multi_p_sc_sc 875
-register_p 876
-unregister_p 877
-get_mro_p_p 878
-box_p_i 879
-box_p_ic 880
-box_p_n 881
-box_p_nc 882
-box_p_s 883
-box_p_sc 884
-clone_s_s 885
-clone_s_sc 886
-exchange_i_i 887
-exchange_p_p 888
-exchange_n_n 889
-exchange_s_s 890
-set_i_i 891
-set_i_ic 892
-set_i_n 893
-set_i_nc 894
-set_i_s 895
-set_i_sc 896
-set_n_n 897
-set_n_nc 898
-set_n_i 899
-set_n_ic 900
-set_n_s 901
-set_n_sc 902
-set_n_p 903
-set_s_p 904
-set_s_s 905
-set_s_sc 906
-set_s_i 907
-set_s_ic 908
-set_s_n 909
-set_s_nc 910
-set_p_pc 911
-set_p_p 912
-set_p_i 913
-set_p_ic 914
-set_p_n 915
-set_p_nc 916
-set_p_s 917
-set_p_sc 918
-set_i_p 919
-assign_p_p 920
-assign_p_i 921
-assign_p_ic 922
-assign_p_n 923
-assign_p_nc 924
-assign_p_s 925
-assign_p_sc 926
-assign_s_s 927
-assign_s_sc 928
-setref_p_p 929
-deref_p_p 930
-setp_ind_i_p 931
-setp_ind_ic_p 932
-setn_ind_i_n 933
-setn_ind_ic_n 934
-setn_ind_i_nc 935
-setn_ind_ic_nc 936
-sets_ind_i_s 937
-sets_ind_ic_s 938
-sets_ind_i_sc 939
-sets_ind_ic_sc 940
-seti_ind_i_i 941
-seti_ind_ic_i 942
-seti_ind_i_ic 943
-seti_ind_ic_ic 944
-set_p_ki_i 945
-set_p_kic_i 946
-set_p_ki_ic 947
-set_p_kic_ic 948
-set_p_ki_n 949
-set_p_kic_n 950
-set_p_ki_nc 951
-set_p_kic_nc 952
-set_p_ki_s 953
-set_p_kic_s 954
-set_p_ki_sc 955
-set_p_kic_sc 956
-set_p_ki_p 957
-set_p_kic_p 958
-set_i_p_ki 959
-set_i_p_kic 960
-set_n_p_ki 961
-set_n_p_kic 962
-set_s_p_ki 963
-set_s_p_kic 964
-set_p_p_ki 965
-set_p_p_kic 966
-set_p_k_i 967
-set_p_kc_i 968
-set_p_k_ic 969
-set_p_kc_ic 970
-set_p_k_n 971
-set_p_kc_n 972
-set_p_k_nc 973
-set_p_kc_nc 974
-set_p_k_s 975
-set_p_kc_s 976
-set_p_k_sc 977
-set_p_kc_sc 978
-set_p_k_p 979
-set_p_kc_p 980
-set_i_p_k 981
-set_i_p_kc 982
-set_n_p_k 983
-set_n_p_kc 984
-set_s_p_k 985
-set_s_p_kc 986
-set_p_p_k 987
-set_p_p_kc 988
-clone_p_p 989
-clone_p_p_p 990
-clone_p_p_pc 991
-copy_p_p 992
-null_s 993
-null_i 994
-null_p 995
-null_n 996
-cleari 997
-clearn 998
-clears 999
-clearp 1000
-stm_start 1001
-stm_validate_ic 1002
-stm_commit_ic 1003
-stm_wait_ic 1004
-stm_abort 1005
-stm_depth_i 1006
-ord_i_s 1007
-ord_i_sc 1008
-ord_i_s_i 1009
-ord_i_sc_i 1010
-ord_i_s_ic 1011
-ord_i_sc_ic 1012
-chr_s_i 1013
-chr_s_ic 1014
-chopn_s_i 1015
-chopn_s_ic 1016
-chopn_s_s_i 1017
-chopn_s_sc_i 1018
-chopn_s_s_ic 1019
-chopn_s_sc_ic 1020
-concat_s_s 1021
-concat_s_sc 1022
-concat_p_p 1023
-concat_p_s 1024
-concat_p_sc 1025
-concat_s_s_s 1026
-concat_s_sc_s 1027
-concat_s_s_sc 1028
-concat_p_p_s 1029
-concat_p_p_sc 1030
-concat_p_p_p 1031
-repeat_s_s_i 1032
-repeat_s_sc_i 1033
-repeat_s_s_ic 1034
-repeat_s_sc_ic 1035
-repeat_p_p_i 1036
-repeat_p_p_ic 1037
-repeat_p_p_p 1038
-repeat_p_i 1039
-repeat_p_ic 1040
-repeat_p_p 1041
-length_i_s 1042
-length_i_sc 1043
-bytelength_i_s 1044
-bytelength_i_sc 1045
-pin_s 1046
-unpin_s 1047
-substr_s_s_i 1048
-substr_s_sc_i 1049
-substr_s_s_ic 1050
-substr_s_sc_ic 1051
-substr_s_s_i_i 1052
-substr_s_sc_i_i 1053
-substr_s_s_ic_i 1054
-substr_s_sc_ic_i 1055
-substr_s_s_i_ic 1056
-substr_s_sc_i_ic 1057
-substr_s_s_ic_ic 1058
-substr_s_sc_ic_ic 1059
-substr_s_s_i_i_s 1060
-substr_s_s_ic_i_s 1061
-substr_s_s_i_ic_s 1062
-substr_s_s_ic_ic_s 1063
-substr_s_s_i_i_sc 1064
-substr_s_s_ic_i_sc 1065
-substr_s_s_i_ic_sc 1066
-substr_s_s_ic_ic_sc 1067
-substr_s_i_i_s 1068
-substr_s_ic_i_s 1069
-substr_s_i_ic_s 1070
-substr_s_ic_ic_s 1071
-substr_s_i_i_sc 1072
-substr_s_ic_i_sc 1073
-substr_s_i_ic_sc 1074
-substr_s_ic_ic_sc 1075
-substr_s_p_i_i 1076
-substr_s_p_ic_i 1077
-substr_s_p_i_ic 1078
-substr_s_p_ic_ic 1079
-index_i_s_s 1080
-index_i_sc_s 1081
-index_i_s_sc 1082
-index_i_sc_sc 1083
-index_i_s_s_i 1084
-index_i_sc_s_i 1085
-index_i_s_sc_i 1086
-index_i_sc_sc_i 1087
-index_i_s_s_ic 1088
-index_i_sc_s_ic 1089
-index_i_s_sc_ic 1090
-index_i_sc_sc_ic 1091
-sprintf_s_s_p 1092
-sprintf_s_sc_p 1093
-sprintf_p_p_p 1094
-new_s 1095
-new_s_i 1096
-new_s_ic 1097
-stringinfo_i_s_i 1098
-stringinfo_i_sc_i 1099
-stringinfo_i_s_ic 1100
-stringinfo_i_sc_ic 1101
-upcase_s_s 1102
-upcase_s_sc 1103
-upcase_s 1104
-downcase_s_s 1105
-downcase_s_sc 1106
-downcase_s 1107
-titlecase_s_s 1108
-titlecase_s_sc 1109
-titlecase_s 1110
-join_s_s_p 1111
-join_s_sc_p 1112
-split_p_s_s 1113
-split_p_sc_s 1114
-split_p_s_sc 1115
-split_p_sc_sc 1116
-charset_i_s 1117
-charset_i_sc 1118
-charsetname_s_i 1119
-charsetname_s_ic 1120
-find_charset_i_s 1121
-find_charset_i_sc 1122
-trans_charset_s_i 1123
-trans_charset_s_ic 1124
-trans_charset_s_s_i 1125
-trans_charset_s_sc_i 1126
-trans_charset_s_s_ic 1127
-trans_charset_s_sc_ic 1128
-encoding_i_s 1129
-encoding_i_sc 1130
-encodingname_s_i 1131
-encodingname_s_ic 1132
-find_encoding_i_s 1133
-find_encoding_i_sc 1134
-trans_encoding_s_i 1135
-trans_encoding_s_ic 1136
-trans_encoding_s_s_i 1137
-trans_encoding_s_sc_i 1138
-trans_encoding_s_s_ic 1139
-trans_encoding_s_sc_ic 1140
-is_cclass_i_i_s_i 1141
-is_cclass_i_ic_s_i 1142
-is_cclass_i_i_sc_i 1143
-is_cclass_i_ic_sc_i 1144
-is_cclass_i_i_s_ic 1145
-is_cclass_i_ic_s_ic 1146
-is_cclass_i_i_sc_ic 1147
-is_cclass_i_ic_sc_ic 1148
-find_cclass_i_i_s_i_i 1149
-find_cclass_i_ic_s_i_i 1150
-find_cclass_i_i_sc_i_i 1151
-find_cclass_i_ic_sc_i_i 1152
-find_cclass_i_i_s_ic_i 1153
-find_cclass_i_ic_s_ic_i 1154
-find_cclass_i_i_sc_ic_i 1155
-find_cclass_i_ic_sc_ic_i 1156
-find_cclass_i_i_s_i_ic 1157
-find_cclass_i_ic_s_i_ic 1158
-find_cclass_i_i_sc_i_ic 1159
-find_cclass_i_ic_sc_i_ic 1160
-find_cclass_i_i_s_ic_ic 1161
-find_cclass_i_ic_s_ic_ic 1162
-find_cclass_i_i_sc_ic_ic 1163
-find_cclass_i_ic_sc_ic_ic 1164
-find_not_cclass_i_i_s_i_i 1165
-find_not_cclass_i_ic_s_i_i 1166
-find_not_cclass_i_i_sc_i_i 1167
-find_not_cclass_i_ic_sc_i_i 1168
-find_not_cclass_i_i_s_ic_i 1169
-find_not_cclass_i_ic_s_ic_i 1170
-find_not_cclass_i_i_sc_ic_i 1171
-find_not_cclass_i_ic_sc_ic_i 1172
-find_not_cclass_i_i_s_i_ic 1173
-find_not_cclass_i_ic_s_i_ic 1174
-find_not_cclass_i_i_sc_i_ic 1175
-find_not_cclass_i_ic_sc_i_ic 1176
-find_not_cclass_i_i_s_ic_ic 1177
-find_not_cclass_i_ic_s_ic_ic 1178
-find_not_cclass_i_i_sc_ic_ic 1179
-find_not_cclass_i_ic_sc_ic_ic 1180
-escape_s_s 1181
-compose_s_s 1182
-compose_s_sc 1183
-spawnw_i_s 1184
-spawnw_i_sc 1185
-spawnw_i_p 1186
-err_i 1187
-err_s 1188
-err_s_i 1189
-err_s_ic 1190
-time_i 1191
-time_n 1192
-gmtime_s_i 1193
-gmtime_s_ic 1194
-localtime_s_i 1195
-localtime_s_ic 1196
-decodetime_p_i 1197
-decodetime_p_ic 1198
-decodelocaltime_p_i 1199
-decodelocaltime_p_ic 1200
-sysinfo_s_i 1201
-sysinfo_s_ic 1202
-sysinfo_i_i 1203
-sysinfo_i_ic 1204
-sleep_i 1205
-sleep_ic 1206
-sleep_n 1207
-sleep_nc 1208
-sizeof_i_i 1209
-sizeof_i_ic 1210
-store_lex_s_p 1211
-store_lex_sc_p 1212
-find_lex_p_s 1213
-find_lex_p_sc 1214
-get_namespace_p 1215
-get_namespace_p_p 1216
-get_namespace_p_pc 1217
-get_hll_namespace_p 1218
-get_hll_namespace_p_p 1219
-get_hll_namespace_p_pc 1220
-get_root_namespace_p 1221
-get_root_namespace_p_p 1222
-get_root_namespace_p_pc 1223
-get_global_p_s 1224
-get_global_p_sc 1225
-get_global_p_p_s 1226
-get_global_p_pc_s 1227
-get_global_p_p_sc 1228
-get_global_p_pc_sc 1229
-get_hll_global_p_s 1230
-get_hll_global_p_sc 1231
-get_hll_global_p_p_s 1232
-get_hll_global_p_pc_s 1233
-get_hll_global_p_p_sc 1234
-get_hll_global_p_pc_sc 1235
-get_root_global_p_s 1236
-get_root_global_p_sc 1237
-get_root_global_p_p_s 1238
-get_root_global_p_pc_s 1239
-get_root_global_p_p_sc 1240
-get_root_global_p_pc_sc 1241
-set_global_s_p 1242
-set_global_sc_p 1243
-set_global_p_s_p 1244
-set_global_pc_s_p 1245
-set_global_p_sc_p 1246
-set_global_pc_sc_p 1247
-set_hll_global_s_p 1248
-set_hll_global_sc_p 1249
-set_hll_global_p_s_p 1250
-set_hll_global_pc_s_p 1251
-set_hll_global_p_sc_p 1252
-set_hll_global_pc_sc_p 1253
-set_root_global_s_p 1254
-set_root_global_sc_p 1255
-set_root_global_p_s_p 1256
-set_root_global_pc_s_p 1257
-set_root_global_p_sc_p 1258
-set_root_global_pc_sc_p 1259
-store_global_s_p 1260
-store_global_sc_p 1261
-store_global_s_s_p 1262
-store_global_sc_s_p 1263
-store_global_s_sc_p 1264
-store_global_sc_sc_p 1265
-store_global_p_s_p 1266
-store_global_pc_s_p 1267
-store_global_p_sc_p 1268
-store_global_pc_sc_p 1269
-find_global_p_s 1270
-find_global_p_sc 1271
-find_global_p_s_s 1272
-find_global_p_sc_s 1273
-find_global_p_s_sc 1274
-find_global_p_sc_sc 1275
-find_global_p_p_s 1276
-find_global_p_pc_s 1277
-find_global_p_p_sc 1278
-find_global_p_pc_sc 1279
-find_name_p_s 1280
-find_name_p_sc 1281
+new_p_s 800
+new_p_sc 801
+new_p_s_p 802
+new_p_sc_p 803
+new_p_s_pc 804
+new_p_sc_pc 805
+new_p_p 806
+new_p_pc 807
+new_p_p_p 808
+new_p_pc_p 809
+new_p_p_pc 810
+new_p_pc_pc 811
+typeof_s_p 812
+typeof_p_p 813
+get_repr_s_p 814
+find_method_p_p_s 815
+find_method_p_p_sc 816
+defined_i_p 817
+defined_i_p_ki 818
+defined_i_p_kic 819
+defined_i_p_k 820
+defined_i_p_kc 821
+exists_i_p_ki 822
+exists_i_p_kic 823
+exists_i_p_k 824
+exists_i_p_kc 825
+delete_p_k 826
+delete_p_kc 827
+delete_p_ki 828
+delete_p_kic 829
+elements_i_p 830
+push_p_i 831
+push_p_ic 832
+push_p_n 833
+push_p_nc 834
+push_p_s 835
+push_p_sc 836
+push_p_p 837
+pop_i_p 838
+pop_n_p 839
+pop_s_p 840
+pop_p_p 841
+unshift_p_i 842
+unshift_p_ic 843
+unshift_p_n 844
+unshift_p_nc 845
+unshift_p_s 846
+unshift_p_sc 847
+unshift_p_p 848
+shift_i_p 849
+shift_n_p 850
+shift_s_p 851
+shift_p_p 852
+setprop_p_s_p 853
+setprop_p_sc_p 854
+getprop_p_s_p 855
+getprop_p_sc_p 856
+delprop_p_s 857
+delprop_p_sc 858
+prophash_p_p 859
+freeze_s_p 860
+thaw_p_s 861
+thaw_p_sc 862
+add_multi_s_s_p 863
+add_multi_sc_s_p 864
+add_multi_s_sc_p 865
+add_multi_sc_sc_p 866
+find_multi_p_s_s 867
+find_multi_p_sc_s 868
+find_multi_p_s_sc 869
+find_multi_p_sc_sc 870
+register_p 871
+unregister_p 872
+get_mro_p_p 873
+box_p_i 874
+box_p_ic 875
+box_p_n 876
+box_p_nc 877
+box_p_s 878
+box_p_sc 879
+clone_s_s 880
+clone_s_sc 881
+exchange_i_i 882
+exchange_p_p 883
+exchange_n_n 884
+exchange_s_s 885
+set_i_i 886
+set_i_ic 887
+set_i_n 888
+set_i_nc 889
+set_i_s 890
+set_i_sc 891
+set_n_n 892
+set_n_nc 893
+set_n_i 894
+set_n_ic 895
+set_n_s 896
+set_n_sc 897
+set_n_p 898
+set_s_p 899
+set_s_s 900
+set_s_sc 901
+set_s_i 902
+set_s_ic 903
+set_s_n 904
+set_s_nc 905
+set_p_pc 906
+set_p_p 907
+set_p_i 908
+set_p_ic 909
+set_p_n 910
+set_p_nc 911
+set_p_s 912
+set_p_sc 913
+set_i_p 914
+assign_p_p 915
+assign_p_i 916
+assign_p_ic 917
+assign_p_n 918
+assign_p_nc 919
+assign_p_s 920
+assign_p_sc 921
+assign_s_s 922
+assign_s_sc 923
+setref_p_p 924
+deref_p_p 925
+setp_ind_i_p 926
+setp_ind_ic_p 927
+setn_ind_i_n 928
+setn_ind_ic_n 929
+setn_ind_i_nc 930
+setn_ind_ic_nc 931
+sets_ind_i_s 932
+sets_ind_ic_s 933
+sets_ind_i_sc 934
+sets_ind_ic_sc 935
+seti_ind_i_i 936
+seti_ind_ic_i 937
+seti_ind_i_ic 938
+seti_ind_ic_ic 939
+set_p_ki_i 940
+set_p_kic_i 941
+set_p_ki_ic 942
+set_p_kic_ic 943
+set_p_ki_n 944
+set_p_kic_n 945
+set_p_ki_nc 946
+set_p_kic_nc 947
+set_p_ki_s 948
+set_p_kic_s 949
+set_p_ki_sc 950
+set_p_kic_sc 951
+set_p_ki_p 952
+set_p_kic_p 953
+set_i_p_ki 954
+set_i_p_kic 955
+set_n_p_ki 956
+set_n_p_kic 957
+set_s_p_ki 958
+set_s_p_kic 959
+set_p_p_ki 960
+set_p_p_kic 961
+set_p_k_i 962
+set_p_kc_i 963
+set_p_k_ic 964
+set_p_kc_ic 965
+set_p_k_n 966
+set_p_kc_n 967
+set_p_k_nc 968
+set_p_kc_nc 969
+set_p_k_s 970
+set_p_kc_s 971
+set_p_k_sc 972
+set_p_kc_sc 973
+set_p_k_p 974
+set_p_kc_p 975
+set_i_p_k 976
+set_i_p_kc 977
+set_n_p_k 978
+set_n_p_kc 979
+set_s_p_k 980
+set_s_p_kc 981
+set_p_p_k 982
+set_p_p_kc 983
+clone_p_p 984
+clone_p_p_p 985
+clone_p_p_pc 986
+copy_p_p 987
+null_s 988
+null_i 989
+null_p 990
+null_n 991
+cleari 992
+clearn 993
+clears 994
+clearp 995
+stm_start 996
+stm_validate_ic 997
+stm_commit_ic 998
+stm_wait_ic 999
+stm_abort 1000
+stm_depth_i 1001
+ord_i_s 1002
+ord_i_sc 1003
+ord_i_s_i 1004
+ord_i_sc_i 1005
+ord_i_s_ic 1006
+ord_i_sc_ic 1007
+chr_s_i 1008
+chr_s_ic 1009
+chopn_s_i 1010
+chopn_s_ic 1011
+chopn_s_s_i 1012
+chopn_s_sc_i 1013
+chopn_s_s_ic 1014
+chopn_s_sc_ic 1015
+concat_s_s 1016
+concat_s_sc 1017
+concat_p_p 1018
+concat_p_s 1019
+concat_p_sc 1020
+concat_s_s_s 1021
+concat_s_sc_s 1022
+concat_s_s_sc 1023
+concat_p_p_s 1024
+concat_p_p_sc 1025
+concat_p_p_p 1026
+repeat_s_s_i 1027
+repeat_s_sc_i 1028
+repeat_s_s_ic 1029
+repeat_s_sc_ic 1030
+repeat_p_p_i 1031
+repeat_p_p_ic 1032
+repeat_p_p_p 1033
+repeat_p_i 1034
+repeat_p_ic 1035
+repeat_p_p 1036
+length_i_s 1037
+length_i_sc 1038
+bytelength_i_s 1039
+bytelength_i_sc 1040
+pin_s 1041
+unpin_s 1042
+substr_s_s_i 1043
+substr_s_sc_i 1044
+substr_s_s_ic 1045
+substr_s_sc_ic 1046
+substr_s_s_i_i 1047
+substr_s_sc_i_i 1048
+substr_s_s_ic_i 1049
+substr_s_sc_ic_i 1050
+substr_s_s_i_ic 1051
+substr_s_sc_i_ic 1052
+substr_s_s_ic_ic 1053
+substr_s_sc_ic_ic 1054
+substr_s_s_i_i_s 1055
+substr_s_s_ic_i_s 1056
+substr_s_s_i_ic_s 1057
+substr_s_s_ic_ic_s 1058
+substr_s_s_i_i_sc 1059
+substr_s_s_ic_i_sc 1060
+substr_s_s_i_ic_sc 1061
+substr_s_s_ic_ic_sc 1062
+substr_s_i_i_s 1063
+substr_s_ic_i_s 1064
+substr_s_i_ic_s 1065
+substr_s_ic_ic_s 1066
+substr_s_i_i_sc 1067
+substr_s_ic_i_sc 1068
+substr_s_i_ic_sc 1069
+substr_s_ic_ic_sc 1070
+substr_s_p_i_i 1071
+substr_s_p_ic_i 1072
+substr_s_p_i_ic 1073
+substr_s_p_ic_ic 1074
+index_i_s_s 1075
+index_i_sc_s 1076
+index_i_s_sc 1077
+index_i_sc_sc 1078
+index_i_s_s_i 1079
+index_i_sc_s_i 1080
+index_i_s_sc_i 1081
+index_i_sc_sc_i 1082
+index_i_s_s_ic 1083
+index_i_sc_s_ic 1084
+index_i_s_sc_ic 1085
+index_i_sc_sc_ic 1086
+sprintf_s_s_p 1087
+sprintf_s_sc_p 1088
+sprintf_p_p_p 1089
+new_s 1090
+new_s_i 1091
+new_s_ic 1092
+stringinfo_i_s_i 1093
+stringinfo_i_sc_i 1094
+stringinfo_i_s_ic 1095
+stringinfo_i_sc_ic 1096
+upcase_s_s 1097
+upcase_s_sc 1098
+upcase_s 1099
+downcase_s_s 1100
+downcase_s_sc 1101
+downcase_s 1102
+titlecase_s_s 1103
+titlecase_s_sc 1104
+titlecase_s 1105
+join_s_s_p 1106
+join_s_sc_p 1107
+split_p_s_s 1108
+split_p_sc_s 1109
+split_p_s_sc 1110
+split_p_sc_sc 1111
+charset_i_s 1112
+charset_i_sc 1113
+charsetname_s_i 1114
+charsetname_s_ic 1115
+find_charset_i_s 1116
+find_charset_i_sc 1117
+trans_charset_s_i 1118
+trans_charset_s_ic 1119
+trans_charset_s_s_i 1120
+trans_charset_s_sc_i 1121
+trans_charset_s_s_ic 1122
+trans_charset_s_sc_ic 1123
+encoding_i_s 1124
+encoding_i_sc 1125
+encodingname_s_i 1126
+encodingname_s_ic 1127
+find_encoding_i_s 1128
+find_encoding_i_sc 1129
+trans_encoding_s_i 1130
+trans_encoding_s_ic 1131
+trans_encoding_s_s_i 1132
+trans_encoding_s_sc_i 1133
+trans_encoding_s_s_ic 1134
+trans_encoding_s_sc_ic 1135
+is_cclass_i_i_s_i 1136
+is_cclass_i_ic_s_i 1137
+is_cclass_i_i_sc_i 1138
+is_cclass_i_ic_sc_i 1139
+is_cclass_i_i_s_ic 1140
+is_cclass_i_ic_s_ic 1141
+is_cclass_i_i_sc_ic 1142
+is_cclass_i_ic_sc_ic 1143
+find_cclass_i_i_s_i_i 1144
+find_cclass_i_ic_s_i_i 1145
+find_cclass_i_i_sc_i_i 1146
+find_cclass_i_ic_sc_i_i 1147
+find_cclass_i_i_s_ic_i 1148
+find_cclass_i_ic_s_ic_i 1149
+find_cclass_i_i_sc_ic_i 1150
+find_cclass_i_ic_sc_ic_i 1151
+find_cclass_i_i_s_i_ic 1152
+find_cclass_i_ic_s_i_ic 1153
+find_cclass_i_i_sc_i_ic 1154
+find_cclass_i_ic_sc_i_ic 1155
+find_cclass_i_i_s_ic_ic 1156
+find_cclass_i_ic_s_ic_ic 1157
+find_cclass_i_i_sc_ic_ic 1158
+find_cclass_i_ic_sc_ic_ic 1159
+find_not_cclass_i_i_s_i_i 1160
+find_not_cclass_i_ic_s_i_i 1161
+find_not_cclass_i_i_sc_i_i 1162
+find_not_cclass_i_ic_sc_i_i 1163
+find_not_cclass_i_i_s_ic_i 1164
+find_not_cclass_i_ic_s_ic_i 1165
+find_not_cclass_i_i_sc_ic_i 1166
+find_not_cclass_i_ic_sc_ic_i 1167
+find_not_cclass_i_i_s_i_ic 1168
+find_not_cclass_i_ic_s_i_ic 1169
+find_not_cclass_i_i_sc_i_ic 1170
+find_not_cclass_i_ic_sc_i_ic 1171
+find_not_cclass_i_i_s_ic_ic 1172
+find_not_cclass_i_ic_s_ic_ic 1173
+find_not_cclass_i_i_sc_ic_ic 1174
+find_not_cclass_i_ic_sc_ic_ic 1175
+escape_s_s 1176
+compose_s_s 1177
+compose_s_sc 1178
+spawnw_i_s 1179
+spawnw_i_sc 1180
+spawnw_i_p 1181
+err_i 1182
+err_s 1183
+err_s_i 1184
+err_s_ic 1185
+time_i 1186
+time_n 1187
+gmtime_s_i 1188
+gmtime_s_ic 1189
+localtime_s_i 1190
+localtime_s_ic 1191
+decodetime_p_i 1192
+decodetime_p_ic 1193
+decodelocaltime_p_i 1194
+decodelocaltime_p_ic 1195
+sysinfo_s_i 1196
+sysinfo_s_ic 1197
+sysinfo_i_i 1198
+sysinfo_i_ic 1199
+sleep_i 1200
+sleep_ic 1201
+sleep_n 1202
+sleep_nc 1203
+sizeof_i_i 1204
+sizeof_i_ic 1205
+store_lex_s_p 1206
+store_lex_sc_p 1207
+find_lex_p_s 1208
+find_lex_p_sc 1209
+get_namespace_p 1210
+get_namespace_p_p 1211
+get_namespace_p_pc 1212
+get_hll_namespace_p 1213
+get_hll_namespace_p_p 1214
+get_hll_namespace_p_pc 1215
+get_root_namespace_p 1216
+get_root_namespace_p_p 1217
+get_root_namespace_p_pc 1218
+get_global_p_s 1219
+get_global_p_sc 1220
+get_global_p_p_s 1221
+get_global_p_pc_s 1222
+get_global_p_p_sc 1223
+get_global_p_pc_sc 1224
+get_hll_global_p_s 1225
+get_hll_global_p_sc 1226
+get_hll_global_p_p_s 1227
+get_hll_global_p_pc_s 1228
+get_hll_global_p_p_sc 1229
+get_hll_global_p_pc_sc 1230
+get_root_global_p_s 1231
+get_root_global_p_sc 1232
+get_root_global_p_p_s 1233
+get_root_global_p_pc_s 1234
+get_root_global_p_p_sc 1235
+get_root_global_p_pc_sc 1236
+set_global_s_p 1237
+set_global_sc_p 1238
+set_global_p_s_p 1239
+set_global_pc_s_p 1240
+set_global_p_sc_p 1241
+set_global_pc_sc_p 1242
+set_hll_global_s_p 1243
+set_hll_global_sc_p 1244
+set_hll_global_p_s_p 1245
+set_hll_global_pc_s_p 1246
+set_hll_global_p_sc_p 1247
+set_hll_global_pc_sc_p 1248
+set_root_global_s_p 1249
+set_root_global_sc_p 1250
+set_root_global_p_s_p 1251
+set_root_global_pc_s_p 1252
+set_root_global_p_sc_p 1253
+set_root_global_pc_sc_p 1254
+store_global_s_p 1255
+store_global_sc_p 1256
+store_global_s_s_p 1257
+store_global_sc_s_p 1258
+store_global_s_sc_p 1259
+store_global_sc_sc_p 1260
+store_global_p_s_p 1261
+store_global_pc_s_p 1262
+store_global_p_sc_p 1263
+store_global_pc_sc_p 1264
+find_global_p_s 1265
+find_global_p_sc 1266
+find_global_p_s_s 1267
+find_global_p_sc_s 1268
+find_global_p_s_sc 1269
+find_global_p_sc_sc 1270
+find_global_p_p_s 1271
+find_global_p_pc_s 1272
+find_global_p_p_sc 1273
+find_global_p_pc_sc 1274
+find_name_p_s 1275
+find_name_p_sc 1276
Modified: branches/remove_pic/src/packfile.c
==============================================================================
--- branches/remove_pic/src/packfile.c (original)
+++ branches/remove_pic/src/packfile.c Tue Dec 23 13:18:02 2008
@@ -403,8 +403,6 @@
}
break;
case PF_UNKNOWN_SEG:
- if (memcmp(seg->name, "PIC_idx", 7) == 0)
- pf->cur_cs->pic_index = seg;
break;
case PF_DEBUG_SEG:
pf->cur_cs->debugs = (PackFile_Debug *)seg;
@@ -1489,9 +1487,6 @@
cur_cs->const_table->code = cur_cs;
- cur_cs->pic_index = create_seg(interp, &pf->directory,
- PF_UNKNOWN_SEG, "PIC_idx", file_name, add);
-
return cur_cs;
}
@@ -2162,7 +2157,6 @@
#ifdef HAS_JIT
Parrot_destroy_jit(byte_code->jit_info);
#endif
- parrot_PIC_destroy(byte_code);
if (byte_code->prederef.code) {
Parrot_free_memalign(byte_code->prederef.code);
byte_code->prederef.code = NULL;
@@ -2173,7 +2167,6 @@
}
byte_code->fixups = NULL;
byte_code->const_table = NULL;
- byte_code->pic_index = NULL;
byte_code->debugs = NULL;
}
Modified: branches/remove_pic/src/pbc_merge.c
==============================================================================
--- branches/remove_pic/src/pbc_merge.c (original)
+++ branches/remove_pic/src/pbc_merge.c Tue Dec 23 13:18:02 2008
@@ -139,19 +139,6 @@
__attribute__nonnull__(1)
__attribute__nonnull__(2);
-static void pbc_merge_pic_index(PARROT_INTERP,
- ARGMOD(pbc_merge_input **inputs),
- int num_inputs,
- ARGMOD(PackFile *pf),
- ARGMOD(PackFile_ByteCode *bc))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2)
- __attribute__nonnull__(4)
- __attribute__nonnull__(5)
- FUNC_MODIFIES(*inputs)
- FUNC_MODIFIES(*pf)
- FUNC_MODIFIES(*bc);
-
static void pbc_merge_write(PARROT_INTERP,
ARGMOD(PackFile *pf),
ARGIN(const char *filename))
@@ -603,57 +590,6 @@
/*
-=item C<static void pbc_merge_pic_index>
-
-This function merges the pic_index segments from the input PBC files.
-
-=cut
-
-*/
-
-static void
-pbc_merge_pic_index(PARROT_INTERP, ARGMOD(pbc_merge_input **inputs),
- int num_inputs, ARGMOD(PackFile *pf), ARGMOD(PackFile_ByteCode *bc))
-{
- int i;
- PackFile_Segment *pic_index;
- size_t size;
- opcode_t cursor = 0;
- opcode_t start = 0;
- opcode_t last = 0;
-
- /* calc needed size */
- for (i = 0, size = 0; i < num_inputs; i++) {
- PackFile_Segment * const in_seg = inputs[i]->pf->cur_cs->pic_index;
- size += in_seg->size;
- }
- pic_index = PackFile_Segment_new_seg(interp,
- &pf->directory, PF_UNKNOWN_SEG, "PIC_idx_MERGED", 1);
- pic_index->data
- = (opcode_t *)mem_sys_allocate_zeroed(size * sizeof (opcode_t));
- pic_index->size = size;
-
- for (i = 0, size = 0; i < num_inputs; i++) {
- PackFile_Segment * const in_seg = inputs[i]->pf->cur_cs->pic_index;
- size_t j;
- /*
- * pic_index is 0 or an ever increasing (by 1) number
- */
- for (j = 0; j < in_seg->size; j++) {
- const opcode_t k = in_seg->data[j];
- if (k) {
- pic_index->data[cursor] = k + start;
- last = k;
- }
- cursor++;
- }
- start = last;
- }
- bc->pic_index = pic_index;
-}
-
-/*
-
=item C<static void pbc_merge_ctpointers>
This function corrects the pointers into the constants table found in the
@@ -766,7 +702,6 @@
pbc_merge_fixups(interp, inputs, num_inputs, merged, bc);
pbc_merge_debugs(interp, inputs, num_inputs, merged, bc);
- pbc_merge_pic_index(interp, inputs, num_inputs, merged, bc);
/* Walk bytecode and fix ops that reference the constants table. */
pbc_merge_ctpointers(interp, inputs, num_inputs, bc);
Modified: branches/remove_pic/src/pmc/eval.pmc
==============================================================================
--- branches/remove_pic/src/pmc/eval.pmc (original)
+++ branches/remove_pic/src/pmc/eval.pmc Tue Dec 23 13:18:02 2008
@@ -190,10 +190,6 @@
cur_cs->fixups = NULL;
}
- seg = cur_cs->pic_index;
- if (seg)
- PackFile_Segment_destroy(INTERP, seg);
-
seg = (PackFile_Segment *)cur_cs;
if (seg)
PackFile_Segment_destroy(INTERP, seg);
@@ -238,10 +234,6 @@
PackFile_add_segment(INTERP, &pf->directory,
(PackFile_Segment *)seg->fixups);
- if (seg->pic_index)
- PackFile_add_segment(INTERP, &pf->directory,
- (PackFile_Segment *)seg->pic_index);
-
size = PackFile_pack_size(INTERP, pf) * sizeof (opcode_t);
/*
-
[svn:parrot] r34289 - in branches/remove_pic: . compilers/imcc config/gen/makefiles include/parrot src src/ops src/pmc
by coke