2015-10-14
2015-10-14 18:49:19 by Martin Nilsson <nilsson@fastmail.com>
-
bd67392d207c0b103e73135135d2f2c67ff90e14
(111 lines)
(+55/-56)
[
Show
| Annotate
]
Branch: 8.1
Removed Intel IA64 compiler specific DO_NOT_WARN.
576:
n->name);
if(TYPEOF(n->u.sval) == T_FUNCTION &&
SUBTYPEOF(n->u.sval) == FUNCTION_BUILTIN)
- emit1(F_CALL_BUILTIN, DO_NOT_WARN((INT32)tmp1));
+ emit1(F_CALL_BUILTIN, (INT32)tmp1);
else
- emit1(F_APPLY, DO_NOT_WARN((INT32)tmp1));
+ emit1(F_APPLY, (INT32)tmp1);
break;
default:
640:
(!(n->tree_info & OPT_EXTERNAL_DEPEND)) &&
(TYPEOF(n->u.sval) != T_TYPE),
n->name);
- emit1(F_CONSTANT, DO_NOT_WARN((INT32)tmp1));
+ emit1(F_CONSTANT, (INT32)tmp1);
break;
default:
785:
while ((arg = my_get_arg(&args, ++no)) && *arg) {
do_docode(*arg, 0);
}
- emit1(F_LTOSVAL_CALL_BUILTIN_AND_ASSIGN, DO_NOT_WARN((INT32)tmp1));
+ emit1(F_LTOSVAL_CALL_BUILTIN_AND_ASSIGN, (INT32)tmp1);
POP_AND_DONT_CLEANUP;
return 1;
}
1199:
if(!CDDR(n))
{
tmp1=alloc_label();
- do_jump_when_zero(CAR(n), DO_NOT_WARN((INT32)tmp1));
+ do_jump_when_zero(CAR(n), (INT32)tmp1);
DO_CODE_BLOCK(CADR(n));
- low_insert_label( DO_NOT_WARN((INT32)tmp1));
+ low_insert_label( (INT32)tmp1 );
current_switch.jumptable = prev_switch_jumptable;
return 0;
}
1209:
if(!CADR(n))
{
tmp1=alloc_label();
- do_jump_when_non_zero(CAR(n), DO_NOT_WARN((INT32)tmp1));
+ do_jump_when_non_zero(CAR(n), (INT32)tmp1);
DO_CODE_BLOCK(CDDR(n));
- low_insert_label( DO_NOT_WARN((INT32)tmp1));
+ low_insert_label( (INT32)tmp1 );
current_switch.jumptable = prev_switch_jumptable;
return 0;
}
tmp1=alloc_label();
- do_jump_when_zero(CAR(n), DO_NOT_WARN((INT32)tmp1));
+ do_jump_when_zero(CAR(n), (INT32)tmp1);
adroppings=do_docode(CADR(n), flags);
tmp3=emit1(F_POP_N_ELEMS,0);
/* Else */
tmp2=do_branch(-1);
- low_insert_label( DO_NOT_WARN((INT32)tmp1));
+ low_insert_label( (INT32)tmp1 );
bdroppings=do_docode(CDDR(n), flags);
if(adroppings < bdroppings)
1234:
if(adroppings > bdroppings)
{
- update_arg(DO_NOT_WARN((INT32)tmp3),
- adroppings - bdroppings);
+ update_arg((INT32)tmp3, adroppings - bdroppings);
adroppings=bdroppings;
}
- low_insert_label( DO_NOT_WARN((INT32)tmp2));
+ low_insert_label( (INT32)tmp2 );
current_switch.jumptable = prev_switch_jumptable;
return adroppings;
1256: Inside #if defined(PIKE_DEBUG)
if(tmp1 & 1)
Pike_fatal("Very internal compiler error.\n");
#endif
- emit1(F_ARRAY_LVALUE, DO_NOT_WARN((INT32)(tmp1>>1)));
+ emit1(F_ARRAY_LVALUE, (INT32)(tmp1>>1) );
emit0(F_MARK);
PUSH_CLEANUP_FRAME(do_pop_mark, 0);
do_docode(CAR(n), 0);
1478:
tmp1=alloc_label();
if(flags & DO_POP)
{
- do_cond_jump(CAR(n), DO_NOT_WARN((INT32)tmp1), n->token == F_LOR, DO_POP);
+ do_cond_jump(CAR(n), (INT32)tmp1, n->token == F_LOR, DO_POP);
DO_CODE_BLOCK(CDR(n));
- low_insert_label( DO_NOT_WARN((INT32)tmp1));
+ low_insert_label( (INT32)tmp1 );
return 0;
}else{
- do_cond_jump(CAR(n), DO_NOT_WARN((INT32)tmp1), n->token == F_LOR, 0);
+ do_cond_jump(CAR(n), (INT32)tmp1, n->token == F_LOR, 0);
code_expression(CDR(n), flags, n->token == F_LOR ? "||" : "&&");
- low_insert_label( DO_NOT_WARN((INT32)tmp1));
+ low_insert_label( (INT32)tmp1 );
return 1;
}
1497:
#endif
do_docode (CDR (n), DO_NOT_COPY);
emit_range (n DO_IF_DEBUG (COMMA num_args));
- return DO_NOT_WARN((INT32)tmp1);
+ return (INT32)tmp1;
}
/* The special bound type nodes are simply ignored when the
1652:
}else{
tmp2=ins_label(-1);
}
- do_jump_when_non_zero(CAR(n), DO_NOT_WARN((INT32)tmp2));
+ do_jump_when_non_zero(CAR(n), (INT32)tmp2);
ins_label(current_label->break_label);
current_switch.jumptable = prev_switch_jumptable;
1706:
/* Doubt it's necessary to use a label separate from
* current_label->break_label, but I'm playing safe. /mast */
tmp3 = alloc_label();
- do_jump(F_FOREACH_START, DO_NOT_WARN((INT32) tmp3));
+ do_jump(F_FOREACH_START, (INT32) tmp3);
tmp1=ins_label(-1);
DO_CODE_BLOCK(CDR(n));
ins_label(current_label->continue_label);
- do_jump(F_FOREACH_LOOP, DO_NOT_WARN((INT32)tmp1));
+ do_jump(F_FOREACH_LOOP, (INT32)tmp1);
ins_label(current_label->break_label);
- low_insert_label( DO_NOT_WARN((INT32)tmp3));
+ low_insert_label( (INT32)tmp3 );
current_switch.jumptable = prev_switch_jumptable;
POP_STATEMENT_LABEL;
1752:
/* The value is negative. replace it with zero. */
emit0(F_POP_VALUE);
emit0(F_CONST0);
- low_insert_label(DO_NOT_WARN((INT32)tmp1));
+ low_insert_label((INT32)tmp1);
goto foreach_arg_pushed;
}
}
1771:
tmp1=ins_label(-1);
DO_CODE_BLOCK(CDR(n));
ins_label(current_label->continue_label);
- low_insert_label( DO_NOT_WARN((INT32)tmp3));
- do_jump(n->token, DO_NOT_WARN((INT32)tmp1));
+ low_insert_label( (INT32)tmp3 );
+ do_jump(n->token, (INT32)tmp1);
ins_label(current_label->break_label);
current_switch.jumptable = prev_switch_jumptable;
1802:
DO_CODE_BLOCK(CDR(n));
ins_label(current_label->continue_label);
- low_insert_label( DO_NOT_WARN((INT32)tmp3));
- do_jump(n->token, DO_NOT_WARN((INT32)tmp1));
+ low_insert_label( (INT32)tmp3 );
+ do_jump(n->token, (INT32)tmp1);
ins_label(current_label->break_label);
current_switch.jumptable = prev_switch_jumptable;
1843:
tmp2=ins_label(-1);
DO_CODE_BLOCK(CAR(n));
ins_label(current_label->continue_label);
- do_jump_when_non_zero(CDR(n), DO_NOT_WARN((INT32)tmp2));
+ do_jump_when_non_zero(CDR(n), (INT32)tmp2);
ins_label(current_label->break_label);
current_switch.jumptable = prev_switch_jumptable;
1872:
emit0(F_CONST0);
else {
if(tmp1>1)
- do_pop(DO_NOT_WARN((INT32)(tmp1-1)));
+ do_pop((INT32)(tmp1-1));
emit0(F_CAST_TO_INT);
}
return 1;
1882:
if(!tmp1)
emit0(F_CONST0);
else if(tmp1>1)
- do_pop(DO_NOT_WARN((INT32)(tmp1-1)));
+ do_pop((INT32)(tmp1-1));
emit0(F_CAST_TO_STRING);
return 1;
default:
1891:
if(!tmp1)
emit0(F_CONST0);
else if(tmp1>1)
- do_pop(DO_NOT_WARN((INT32)(tmp1-1)));
+ do_pop((INT32)(tmp1-1));
return 1;
}
}
1899:
struct svalue sv;
SET_SVAL(sv, T_TYPE, 0, type, n->type);
tmp1 = store_constant(&sv, 0, n->name);
- emit1(F_CONSTANT, DO_NOT_WARN((INT32)tmp1));
+ emit1(F_CONSTANT, (INT32)tmp1);
}
tmp1=do_docode(CAR(n),0);
if(!tmp1) { emit0(F_CONST0); tmp1=1; }
- if(tmp1>1) do_pop(DO_NOT_WARN((INT32)(tmp1-1)));
+ if(tmp1>1) do_pop((INT32)(tmp1-1));
emit0(F_CAST);
return 1;
1915:
struct svalue sv;
SET_SVAL(sv, T_TYPE, 0, type, n->type);
tmp1 = store_constant(&sv, 0, n->name);
- emit1(F_CONSTANT, DO_NOT_WARN((INT32)tmp1));
+ emit1(F_CONSTANT, (INT32)tmp1);
}
tmp1 = do_docode(CAR(n), 0);
if (!tmp1) { emit0(F_CONST0); tmp1 = 1; }
- if (tmp1 > 1) do_pop(DO_NOT_WARN((INT32)(tmp1 - 1)));
+ if (tmp1 > 1) do_pop((INT32)(tmp1 - 1));
emit0(F_SOFT_CAST);
return 1;
}
tmp1 = do_docode(CAR(n), flags);
- if (tmp1 > 1) do_pop(DO_NOT_WARN((INT32)(tmp1 - 1)));
+ if (tmp1 > 1) do_pop((INT32)(tmp1 - 1));
return !!tmp1;
case F_APPLY:
1944:
tmp1=store_constant(& CAR(n)->u.sval,
!(CAR(n)->tree_info & OPT_EXTERNAL_DEPEND),
CAR(n)->name);
- emit1(F_CALL_BUILTIN1, DO_NOT_WARN((INT32)tmp1));
+ emit1(F_CALL_BUILTIN1, (INT32)tmp1);
#ifdef USE_APPLY_N
}else if(args>0){
do_docode(CDR(n),0);
tmp1=store_constant(& CAR(n)->u.sval,
!(CAR(n)->tree_info & OPT_EXTERNAL_DEPEND),
CAR(n)->name);
- emit2(F_CALL_BUILTIN_N, DO_NOT_WARN((INT32)tmp1), args);
+ emit2(F_CALL_BUILTIN_N, (INT32)tmp1, args);
#endif
}else{
emit0(F_MARK);
1960:
tmp1=store_constant(& CAR(n)->u.sval,
!(CAR(n)->tree_info & OPT_EXTERNAL_DEPEND),
CAR(n)->name);
- emit1(F_CALL_BUILTIN, DO_NOT_WARN((INT32)tmp1));
+ emit1(F_CALL_BUILTIN, (INT32)tmp1);
POP_AND_DONT_CLEANUP;
}
}
1982:
tmp1=store_constant(& CAR(n)->u.sval,
!(CAR(n)->tree_info & OPT_EXTERNAL_DEPEND),
CAR(n)->name);
- emit1(F_APPLY, DO_NOT_WARN((INT32)tmp1));
+ emit1(F_APPLY, (INT32)tmp1);
POP_AND_DONT_CLEANUP;
}
#ifdef USE_APPLY_N
1992: Inside #if defined(USE_APPLY_N)
tmp1=store_constant(& CAR(n)->u.sval,
!(CAR(n)->tree_info & OPT_EXTERNAL_DEPEND),
CAR(n)->name);
- emit2(F_APPLY_N, DO_NOT_WARN((INT32)tmp1), args);
+ emit2(F_APPLY_N, (INT32)tmp1, args);
}
#endif
return 1;
2044:
}else{
/* We might want to put "predef::"+foo->name here /Hubbe */
tmp1=store_constant(& foo->u.sval, 1, foo->name);
- emit1(F_APPLY, DO_NOT_WARN((INT32)tmp1));
+ emit1(F_APPLY, (INT32)tmp1);
}
}
free_node(foo);
2100:
/* Restore root->parent. */
root->parent = parent;
}
- return DO_NOT_WARN((INT32)tmp1);
+ return (INT32)tmp1;
/* Switch:
2152:
for(e=1; e<cases*2+2; e++)
{
- jumptable[e] = DO_NOT_WARN((INT32)emit1(F_POINTER, 0));
+ jumptable[e] = (INT32)emit1(F_POINTER, 0);
current_switch.jumptable[e]=-1;
}
emit0(F_NOTREACHED);
2215:
for(e=1; e<cases*2+2; e++)
update_arg(jumptable[e], current_switch.jumptable[e]);
- update_arg(DO_NOT_WARN((INT32)tmp1),
- store_constant(Pike_sp-1,1,0));
+ update_arg((INT32)tmp1, store_constant(Pike_sp-1,1,0));
pop_stack();
free(jumptable);
2458:
case F_SSCANF:
tmp1=do_docode(CAR(n),DO_NOT_COPY);
tmp2=do_docode(CDR(n),DO_NOT_COPY | DO_LVALUE);
- emit1(F_SSCANF, DO_NOT_WARN((INT32)(tmp1+tmp2)));
+ emit1(F_SSCANF, (INT32)(tmp1+tmp2));
return 1;
case F_CATCH: {
2492:
* that requires the entry code to have run.
*/
emit0(F_ENTRY);
- ins_label(DO_NOT_WARN((INT32)tmp1));
+ ins_label((INT32)tmp1);
POP_AND_DONT_CLEANUP;
return 1;
2508: Inside #if defined(PIKE_DEBUG)
if(tmp1 & 1)
Pike_fatal("Very internal compiler error.\n");
#endif
- emit1(F_ARRAY_LVALUE, DO_NOT_WARN((INT32)(tmp1>>1)));
+ emit1(F_ARRAY_LVALUE, (INT32)(tmp1>>1));
return 2;
case F_ARROW:
2534:
emit0(F_COPY_VALUE);
}
}
- return DO_NOT_WARN((INT32)tmp1);
+ return (INT32)tmp1;
case F_INDEX:
if(flags & WANT_LVALUE)
2574:
emit0(F_COPY_VALUE);
}
}
- return DO_NOT_WARN((INT32)tmp1);
+ return (INT32)tmp1;
case F_CONSTANT:
switch(TYPEOF(n->u.sval))
2604:
case T_STRING:
tmp1=store_prog_string(n->u.sval.u.string);
- emit1(F_STRING, DO_NOT_WARN((INT32)tmp1));
+ emit1(F_STRING, (INT32)tmp1);
return 1;
case T_FUNCTION:
2652:
tmp1=store_constant(&(n->u.sval),
!(n->tree_info & OPT_EXTERNAL_DEPEND),
n->name);
- emit1(F_CONSTANT, DO_NOT_WARN((INT32)tmp1));
+ emit1(F_CONSTANT, (INT32)tmp1);
return 1;
case T_TYPE:
tmp1 = store_constant(&(n->u.sval), 0, n->name);
- emit1(F_CONSTANT, DO_NOT_WARN((INT32)tmp1));
+ emit1(F_CONSTANT, (INT32)tmp1);
return 1;
case T_ARRAY:
2666:
tmp1=store_constant(&(n->u.sval),
!(n->tree_info & OPT_EXTERNAL_DEPEND),
n->name);
- emit1(F_CONSTANT, DO_NOT_WARN((INT32)tmp1));
+ emit1(F_CONSTANT, (INT32)tmp1);
/* copy now or later ? */
if(!(flags & DO_NOT_COPY) && !(n->tree_info & OPT_EXTERNAL_DEPEND))