Re: Many external symbols _without_ prefix in libruby object file

Hi,

On Mon, 24 Dec 2007 11:48:11 +0900
Yukihiro Matsumoto <[e-mail]> wrote:

> Thank you.  I'd like to merge the patch, but it's corrupted.  Could
> you re-send it with folding turned off?

Oops, sorry.  And I added #undef things in vm.c.


Index: blockinlining.c
===================================================================
--- blockinlining.c	(revision 14585)
+++ blockinlining.c	(working copy)
@@ -139,7 +139,7 @@
 
 	node =
 	    NEW_WHILE(NEW_CALL
-		      (NEW_DVAR(e), idLT, new_ary(NEW_DVAR(_self), 0)),
+		      (NEW_DVAR(e), '<', new_ary(NEW_DVAR(_self), 0)),
 		      new_block(NEW_OPTBLOCK(node),
 				NEW_DASGN(e,
 					  NEW_CALL(NEW_DVAR(e), idSucc, 0))),
@@ -164,7 +164,7 @@
 	node =
 	    new_block(NEW_DASGN(_e, NEW_DVAR(e)),
 		      NEW_WHILE(NEW_CALL
-				(NEW_DVAR(_e), idLT,
+				(NEW_DVAR(_e), '<',
 				 new_ary(NEW_DVAR(_self), 0)),
 				new_block(assign,
 					  new_block(NEW_OPTBLOCK(node),
@@ -290,7 +290,7 @@
 			 VALUE param_vars, VALUE local_vars)
 {
     return build_Range_each_node(iseq, node, lnode,
-				 param_vars, local_vars, idLT);
+				 param_vars, local_vars, '<');
 }
 
 VALUE
@@ -375,7 +375,7 @@
 
 	node =
 	    new_block(NEW_DASGN(_i, NEW_LIT(INT2FIX(0))),
-		      NEW_WHILE(NEW_CALL(NEW_DVAR(_i), idLT,
+		      NEW_WHILE(NEW_CALL(NEW_DVAR(_i), '<',
 					 new_ary(NEW_CALL
 						 (NEW_DVAR(_self), idLength,
 						  0), 0)),
@@ -406,7 +406,7 @@
 
 	node =
 	    new_block(NEW_DASGN(_i, NEW_LIT(INT2FIX(0))),
-		      NEW_WHILE(NEW_CALL(NEW_DVAR(_i), idLT,
+		      NEW_WHILE(NEW_CALL(NEW_DVAR(_i), '<',
 					 new_ary(NEW_CALL
 						 (NEW_DVAR(_self), idLength,
 						  0), 0)), new_block(assign,
Index: compile.c
===================================================================
--- compile.c	(revision 14585)
+++ compile.c	(working copy)
@@ -1451,26 +1451,26 @@
 		else if (mid == idSucc) {
 		    insn_set_specialized_instruction(iobj, BIN(opt_succ));
 		}
-		else if (mid == idNot) {
+		else if (mid == '!') {
 		    insn_set_specialized_instruction_with_ic(iobj, BIN(opt_not), 1);
 		}
 	    }
 	    else if (argc == 1) {
 		if (0) {
 		}
-		else if (mid == idPLUS) {
+		else if (mid == '+') {
 		    insn_set_specialized_instruction(iobj, BIN(opt_plus));
 		}
-		else if (mid == idMINUS) {
+		else if (mid == '-') {
 		    insn_set_specialized_instruction(iobj, BIN(opt_minus));
 		}
-		else if (mid == idMULT) {
+		else if (mid == '*') {
 		    insn_set_specialized_instruction(iobj, BIN(opt_mult));
 		}
-		else if (mid == idDIV) {
+		else if (mid == '/') {
 		    insn_set_specialized_instruction(iobj, BIN(opt_div));
 		}
-		else if (mid == idMOD) {
+		else if (mid == '%') {
 		    insn_set_specialized_instruction(iobj, BIN(opt_mod));
 		}
 		else if (mid == idEq) {
@@ -1479,13 +1479,13 @@
 		else if (mid == idNeq) {
 		    insn_set_specialized_instruction_with_ic(iobj, BIN(opt_neq), 2);
 		}
-		else if (mid == idLT) {
+		else if (mid == '<') {
 		    insn_set_specialized_instruction(iobj, BIN(opt_lt));
 		}
 		else if (mid == idLE) {
 		    insn_set_specialized_instruction(iobj, BIN(opt_le));
 		}
-		else if (mid == idGT) {
+		else if (mid == '>') {
 		    insn_set_specialized_instruction(iobj, BIN(opt_gt));
 		}
 		else if (mid == idGE) {
@@ -3996,7 +3996,7 @@
       case NODE_XSTR:{
 	ADD_CALL_RECEIVER(ret, nd_line(node));
 	ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit);
-	ADD_CALL(ret, nd_line(node), ID2SYM(idBackquote), INT2FIX(1));
+	ADD_CALL(ret, nd_line(node), ID2SYM('`'), INT2FIX(1));
 
 	if (poped) {
 	    ADD_INSN(ret, nd_line(node), pop);
@@ -4006,7 +4006,7 @@
       case NODE_DXSTR:{
 	ADD_CALL_RECEIVER(ret, nd_line(node));
 	compile_dstr(iseq, ret, node);
-	ADD_CALL(ret, nd_line(node), ID2SYM(idBackquote), INT2FIX(1));
+	ADD_CALL(ret, nd_line(node), ID2SYM('`'), INT2FIX(1));
 
 	if (poped) {
 	    ADD_INSN(ret, nd_line(node), pop);
Index: id.c
===================================================================
--- id.c	(revision 14585)
+++ id.c	(working copy)
@@ -19,33 +19,19 @@
 void
 Init_id(void)
 {
-    /* Symbols */
-    symIFUNC = ID2SYM(rb_intern("<IFUNC>"));
-    symCFUNC = ID2SYM(rb_intern("<CFUNC>"));
-
     /* IDs */
-    idPLUS = rb_intern("+");
-    idMINUS = rb_intern("-");
-    idMULT = rb_intern("*");
-    idDIV = rb_intern("/");
-    idMOD = rb_intern("%");
-    idLT = rb_intern("<");
     idLTLT = rb_intern("<<");
     idLE = rb_intern("<=");
-    idGT = rb_intern(">");
     idGE = rb_intern(">=");
     idEq = rb_intern("==");
     idEqq = rb_intern("===");
-    idBackquote = rb_intern("`");
     idEqTilde = rb_intern("=~");
-    idNot = rb_intern("!");
     idNeq = rb_intern("!=");
 
     idAREF = rb_intern("[]");
     idASET = rb_intern("[]=");
 
     idEach = rb_intern("each");
-    idTimes = rb_intern("times");
     idLength = rb_intern("length");
     idLambda = rb_intern("lambda");
     idIntern = rb_intern("intern");
Index: id.h
===================================================================
--- id.h	(revision 14585)
+++ id.h	(working copy)
@@ -10,24 +10,12 @@
 
 **********************************************************************/
 
-extern VALUE symIFUNC;
-extern VALUE symCFUNC;
-
-extern ID idPLUS;
-extern ID idMINUS;
-extern ID idMULT;
-extern ID idDIV;
-extern ID idMOD;
-extern ID idLT;
 extern ID idLTLT;
 extern ID idLE;
-extern ID idGT;
 extern ID idGE;
 extern ID idEq;
 extern ID idEqq;
 extern ID idNeq;
-extern ID idNot;
-extern ID idBackquote;
 extern ID idEqTilde;
 extern ID idThrowState;
 extern ID idAREF;
@@ -42,14 +30,12 @@
 extern ID idRangeEachLT;
 extern ID idRangeEachLE;
 extern ID idArrayEach;
-extern ID idTimes;
 extern ID idEnd;
 extern ID idBitblt;
 extern ID idAnswer;
 extern ID idSend;
 extern ID idSendBang;
 extern ID id__send;
-extern ID id__send_bang;
 extern ID id__send__;
 
 
Index: vm.c
===================================================================
--- vm.c	(revision 14585)
+++ vm.c	(working copy)
@@ -999,24 +999,26 @@
     vm_opt_method_table = st_init_numtable();
 
 #define OP(mid_, bop_) (mid = id##mid_, bop = BOP_##bop_)
+#define OP2(mid_, bop_) (mid = mid_, bop = BOP_##bop_)    
 #define C(k) add_opt_method(rb_c##k, mid, bop)
-    OP(PLUS, PLUS), (C(Fixnum), C(Float), C(String), C(Array));
-    OP(MINUS, MINUS), (C(Fixnum));
-    OP(MULT, MULT), (C(Fixnum), C(Float));
-    OP(DIV, DIV), (C(Fixnum), C(Float));
-    OP(MOD, MOD), (C(Fixnum), C(Float));
+    OP2('+', PLUS), (C(Fixnum), C(Float), C(String), C(Array));
+    OP2('-', MINUS), (C(Fixnum));
+    OP2('*', MULT), (C(Fixnum), C(Float));
+    OP2('/', DIV), (C(Fixnum), C(Float));
+    OP2('%', MOD), (C(Fixnum), C(Float));
     OP(Eq, EQ), (C(Fixnum), C(Float), C(String));
-    OP(LT, LT), (C(Fixnum));
+    OP2('<', LT), (C(Fixnum));
     OP(LE, LE), (C(Fixnum));
     OP(LTLT, LTLT), (C(String), C(Array));
     OP(AREF, AREF), (C(Array), C(Hash));
     OP(ASET, ASET), (C(Array), C(Hash));
     OP(Length, LENGTH), (C(Array), C(String), C(Hash));
     OP(Succ, SUCC), (C(Fixnum), C(String), C(Time));
-    OP(GT, GT), (C(Fixnum));
+    OP2('>', GT), (C(Fixnum));
     OP(GE, GE), (C(Fixnum));
 #undef C
 #undef OP
+#undef OP2
 }
 
 /* evaluator body */
Index: insns.def
===================================================================
--- insns.def	(revision 14585)
+++ insns.def	(working copy)
@@ -1395,7 +1395,7 @@
       INSN_LABEL(normal_dispatch):
 	PUSH(recv);
 	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idPLUS, recv);
+	CALL_SIMPLE_METHOD(1, '+', recv);
     }
 }
 
@@ -1429,7 +1429,7 @@
 	/* other */
 	PUSH(recv);
 	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idMINUS, recv);
+	CALL_SIMPLE_METHOD(1, '-', recv);
     }
 }
 
@@ -1482,7 +1482,7 @@
       INSN_LABEL(normal_dispatch):
 	PUSH(recv);
 	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idMULT, recv);
+	CALL_SIMPLE_METHOD(1, '*', recv);
     }
 }
 
@@ -1546,7 +1546,7 @@
       INSN_LABEL(normal_dispatch):
 	PUSH(recv);
 	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idDIV, recv);
+	CALL_SIMPLE_METHOD(1, '/', recv);
     }
 }
 
@@ -1625,7 +1625,7 @@
       INSN_LABEL(normal_dispatch):
 	PUSH(recv);
 	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idMOD, recv);
+	CALL_SIMPLE_METHOD(1, '%', recv);
     }
 }
 
@@ -1706,7 +1706,7 @@
     else {
 	PUSH(recv);
 	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idLT, recv);
+	CALL_SIMPLE_METHOD(1, '<', recv);
     }
 }
 
@@ -1765,7 +1765,7 @@
     else {
 	PUSH(recv);
 	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idGT, recv);
+	CALL_SIMPLE_METHOD(1, '>', recv);
     }
 }
 
@@ -1988,14 +1988,14 @@
 (VALUE val)
 {
     extern VALUE rb_obj_not(VALUE obj);
-    NODE *mn = vm_method_search(idNot, CLASS_OF(recv), ic);
+    NODE *mn = vm_method_search('!', CLASS_OF(recv), ic);
 
     if (check_cfunc(mn, rb_obj_not)) {
 	val = RTEST(recv) ? Qfalse : Qtrue;
     }
     else {
 	PUSH(recv);
-	CALL_SIMPLE_METHOD(0, idNot, recv);
+	CALL_SIMPLE_METHOD(0, '!', recv);
     }
 }
 

-- 
Tadashi Saito