[svn:parrot] r40646 - in branches/pmc_sans_unionval: compilers/imcc include/parrot src src/gc
whiteknight at svn.parrot.org
whiteknight at svn.parrot.org
Wed Aug 19 00:28:50 UTC 2009
Author: whiteknight
Date: Wed Aug 19 00:28:49 2009
New Revision: 40646
URL: https://trac.parrot.org/parrot/changeset/40646
Log:
[pmc_sans_unionval] remove a few more references to the PMC_EXT structure. rename functions that don't deal with it anymore
Modified:
branches/pmc_sans_unionval/compilers/imcc/imcparser.c
branches/pmc_sans_unionval/include/parrot/gc_api.h
branches/pmc_sans_unionval/src/gc/api.c
branches/pmc_sans_unionval/src/pmc.c
branches/pmc_sans_unionval/src/pmc_freeze.c
Modified: branches/pmc_sans_unionval/compilers/imcc/imcparser.c
==============================================================================
--- branches/pmc_sans_unionval/compilers/imcc/imcparser.c Wed Aug 19 00:21:48 2009 (r40645)
+++ branches/pmc_sans_unionval/compilers/imcc/imcparser.c Wed Aug 19 00:28:49 2009 (r40646)
@@ -3221,17 +3221,17 @@
{
case 2:
#line 1144 "compilers/imcc/imcc.y"
- { if (yynerrs) YYABORT; (yyval.i) = 0; ;}
+ { if (yynerrs) YYABORT; (yyval.i) = 0; }
break;
case 5:
#line 1153 "compilers/imcc/imcc.y"
- { (yyval.i) = (yyvsp[(1) - (1)].i); ;}
+ { (yyval.i) = (yyvsp[(1) - (1)].i); }
break;
case 6:
#line 1154 "compilers/imcc/imcc.y"
- { (yyval.i) = (yyvsp[(1) - (1)].i); ;}
+ { (yyval.i) = (yyvsp[(1) - (1)].i); }
break;
case 7:
@@ -3240,7 +3240,7 @@
(yyval.i) = (yyvsp[(1) - (1)].i);
imc_close_unit(interp, IMCC_INFO(interp)->cur_unit);
IMCC_INFO(interp)->cur_unit = 0;
- ;}
+ }
break;
case 8:
@@ -3249,32 +3249,32 @@
(yyval.i) = (yyvsp[(1) - (1)].i);
imc_close_unit(interp, IMCC_INFO(interp)->cur_unit);
IMCC_INFO(interp)->cur_unit = 0;
- ;}
+ }
break;
case 9:
#line 1167 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; ;}
+ { (yyval.i) = 0; }
break;
case 10:
#line 1168 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; ;}
+ { (yyval.i) = 0; }
break;
case 11:
#line 1169 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; ;}
+ { (yyval.i) = 0; }
break;
case 12:
#line 1170 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; ;}
+ { (yyval.i) = 0; }
break;
case 13:
#line 1174 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; ;}
+ { (yyval.i) = 0; }
break;
case 14:
@@ -3283,7 +3283,7 @@
(yyval.i) = 0;
do_loadlib(interp, (yyvsp[(2) - (3)].s));
mem_sys_free((yyvsp[(2) - (3)].s));
- ;}
+ }
break;
case 15:
@@ -3292,7 +3292,7 @@
IMCC_INFO(interp)->line = atoi((yyvsp[(2) - (5)].s));
/* set_filename() frees the STRINGC */
set_filename(interp, (yyvsp[(4) - (5)].s));
- ;}
+ }
break;
case 16:
@@ -3300,7 +3300,7 @@
{
/* set_filename() frees the STRINGC */
set_filename(interp, (yyvsp[(2) - (3)].s));
- ;}
+ }
break;
case 17:
@@ -3311,7 +3311,7 @@
SymReg * const key = mk_const(interp, (yyvsp[(2) - (4)].s), 'S');
(yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, ".annotate", 2, key, (yyvsp[(4) - (4)].sr));
mem_sys_free((yyvsp[(2) - (4)].s));
- ;}
+ }
break;
case 18:
@@ -3324,12 +3324,12 @@
IMCC_INFO(interp)->cur_namespace = NULL;
mem_sys_free((yyvsp[(2) - (2)].s));
(yyval.t) = 0;
- ;}
+ }
break;
case 19:
#line 1223 "compilers/imcc/imcc.y"
- { IMCC_INFO(interp)->is_def = 1; ;}
+ { IMCC_INFO(interp)->is_def = 1; }
break;
case 20:
@@ -3338,12 +3338,12 @@
mk_const_ident(interp, (yyvsp[(4) - (6)].s), (yyvsp[(3) - (6)].t), (yyvsp[(6) - (6)].sr), 1);
mem_sys_free((yyvsp[(4) - (6)].s));
IMCC_INFO(interp)->is_def = 0;
- ;}
+ }
break;
case 21:
#line 1232 "compilers/imcc/imcc.y"
- { IMCC_INFO(interp)->is_def = 1; ;}
+ { IMCC_INFO(interp)->is_def = 1; }
break;
case 22:
@@ -3352,12 +3352,12 @@
(yyval.i) = mk_pmc_const(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(3) - (6)].s), (yyvsp[(4) - (6)].sr), (yyvsp[(6) - (6)].s));
mem_sys_free((yyvsp[(6) - (6)].s));
IMCC_INFO(interp)->is_def = 0;
- ;}
+ }
break;
case 23:
#line 1239 "compilers/imcc/imcc.y"
- { IMCC_INFO(interp)->is_def = 1; ;}
+ { IMCC_INFO(interp)->is_def = 1; }
break;
case 24:
@@ -3367,37 +3367,37 @@
mem_sys_free((yyvsp[(3) - (6)].s));
mem_sys_free((yyvsp[(6) - (6)].s));
IMCC_INFO(interp)->is_def = 0;
- ;}
+ }
break;
case 29:
#line 1258 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; ;}
+ { (yyval.i) = 0; }
break;
case 30:
#line 1259 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; ;}
+ { (yyval.i) = 0; }
break;
case 31:
#line 1260 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; ;}
+ { (yyval.i) = 0; }
break;
case 32:
#line 1261 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; ;}
+ { (yyval.i) = 0; }
break;
case 33:
#line 1262 "compilers/imcc/imcc.y"
- { (yyval.i) = (yyvsp[(1) - (1)].i); ;}
+ { (yyval.i) = (yyvsp[(1) - (1)].i); }
break;
case 36:
#line 1267 "compilers/imcc/imcc.y"
- { clear_state(interp); ;}
+ { clear_state(interp); }
break;
case 37:
@@ -3407,7 +3407,7 @@
(yyvsp[(2) - (3)].s), 0, IMCC_INFO(interp)->regs,
IMCC_INFO(interp)->nargs, IMCC_INFO(interp) -> keyvec, 1);
mem_sys_free((yyvsp[(2) - (3)].s));
- ;}
+ }
break;
case 38:
@@ -3415,7 +3415,7 @@
{
imc_close_unit(interp, IMCC_INFO(interp)->cur_unit);
IMCC_INFO(interp)->cur_unit = imc_open_unit(interp, IMC_PASM);
- ;}
+ }
break;
case 39:
@@ -3426,14 +3426,14 @@
mk_sub_label(interp, (yyvsp[(4) - (4)].s)));
IMCC_INFO(interp)->cur_call->pcc_sub->pragma = (yyvsp[(3) - (4)].t);
mem_sys_free((yyvsp[(4) - (4)].s));
- ;}
+ }
break;
case 40:
#line 1289 "compilers/imcc/imcc.y"
{
(yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "null", 1, (yyvsp[(2) - (2)].sr));
- ;}
+ }
break;
case 41:
@@ -3449,17 +3449,17 @@
mem_sys_free(name);
mem_sys_free((yyvsp[(2) - (4)].s));
mem_sys_free((yyvsp[(4) - (4)].s));
- ;}
+ }
break;
case 42:
#line 1305 "compilers/imcc/imcc.y"
- { (yyval.i) = 0;;}
+ { (yyval.i) = 0;}
break;
case 44:
#line 1313 "compilers/imcc/imcc.y"
- { IMCC_INFO(interp)->cur_unit = imc_open_unit(interp, IMC_PASM); ;}
+ { IMCC_INFO(interp)->cur_unit = imc_open_unit(interp, IMC_PASM); }
break;
case 45:
@@ -3470,7 +3470,7 @@
emit_flush(interp);
*/
(yyval.i) = 0;
- ;}
+ }
break;
case 48:
@@ -3485,33 +3485,33 @@
IMCC_INFO(interp)->cur_namespace = (yyvsp[(2) - (3)].sr);
if (re_open)
IMCC_INFO(interp)->cur_unit = imc_open_unit(interp, IMC_PASM);
- ;}
+ }
break;
case 49:
#line 1347 "compilers/imcc/imcc.y"
{
(yyval.sr) = (yyvsp[(2) - (3)].sr);
- ;}
+ }
break;
case 50:
#line 1350 "compilers/imcc/imcc.y"
- { (yyval.sr) = NULL; ;}
+ { (yyval.sr) = NULL; }
break;
case 51:
#line 1355 "compilers/imcc/imcc.y"
{
IMCC_INFO(interp)->cur_unit = imc_open_unit(interp, IMC_PCCSUB);
- ;}
+ }
break;
case 52:
#line 1359 "compilers/imcc/imcc.y"
{
iSUBROUTINE(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(3) - (3)].sr));
- ;}
+ }
break;
case 53:
@@ -3522,22 +3522,22 @@
IMCC_INFO(interp)->cur_unit->instructions->symregs[0]->subid = mem_sys_strdup(
IMCC_INFO(interp)->cur_unit->instructions->symregs[0]->name);
}
- ;}
+ }
break;
case 54:
#line 1371 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; IMCC_INFO(interp)->cur_call = NULL; ;}
+ { (yyval.i) = 0; IMCC_INFO(interp)->cur_call = NULL; }
break;
case 55:
#line 1375 "compilers/imcc/imcc.y"
- { (yyval.sr) = 0; ;}
+ { (yyval.sr) = 0; }
break;
case 56:
#line 1376 "compilers/imcc/imcc.y"
- { (yyval.sr) = 0; ;}
+ { (yyval.sr) = 0; }
break;
case 57:
@@ -3550,17 +3550,17 @@
}
else
add_pcc_arg(IMCC_INFO(interp)->cur_call, (yyvsp[(2) - (3)].sr));
- ;}
+ }
break;
case 58:
#line 1390 "compilers/imcc/imcc.y"
- { IMCC_INFO(interp)->is_def = 1; ;}
+ { IMCC_INFO(interp)->is_def = 1; }
break;
case 59:
#line 1390 "compilers/imcc/imcc.y"
- { (yyval.sr) = (yyvsp[(3) - (3)].sr); IMCC_INFO(interp)->is_def = 0; ;}
+ { (yyval.sr) = (yyvsp[(3) - (3)].sr); IMCC_INFO(interp)->is_def = 0; }
break;
case 60:
@@ -3572,12 +3572,12 @@
(yyval.sr) = mk_ident(interp, (yyvsp[(2) - (3)].s), (yyvsp[(1) - (3)].t));
(yyval.sr)->type |= (yyvsp[(3) - (3)].t);
mem_sys_free((yyvsp[(2) - (3)].s));
- ;}
+ }
break;
case 61:
#line 1408 "compilers/imcc/imcc.y"
- { (yyval.t) = 0; ;}
+ { (yyval.t) = 0; }
break;
case 62:
@@ -3586,7 +3586,7 @@
(yyval.t) = 0;
IMCC_INFO(interp)->cur_unit->outer = mk_sub_address_fromc(interp, (yyvsp[(3) - (4)].s));
mem_sys_free((yyvsp[(3) - (4)].s));
- ;}
+ }
break;
case 63:
@@ -3595,7 +3595,7 @@
(yyval.t) = 0;
IMCC_INFO(interp)->cur_unit->outer = mk_const(interp, (yyvsp[(3) - (4)].s), 'S');
mem_sys_free((yyvsp[(3) - (4)].s));
- ;}
+ }
break;
case 64:
@@ -3604,7 +3604,7 @@
(yyval.t) = P_VTABLE;
IMCC_INFO(interp)->cur_unit->vtable_name = NULL;
IMCC_INFO(interp)->cur_unit->is_vtable_method = 1;
- ;}
+ }
break;
case 65:
@@ -3613,7 +3613,7 @@
(yyval.t) = P_VTABLE;
IMCC_INFO(interp)->cur_unit->vtable_name = (yyvsp[(3) - (4)].s);
IMCC_INFO(interp)->cur_unit->is_vtable_method = 1;
- ;}
+ }
break;
case 66:
@@ -3622,7 +3622,7 @@
(yyval.t) = P_METHOD;
IMCC_INFO(interp)->cur_unit->method_name = NULL;
IMCC_INFO(interp)->cur_unit->is_method = 1;
- ;}
+ }
break;
case 67:
@@ -3631,7 +3631,7 @@
(yyval.t) = P_METHOD;
IMCC_INFO(interp)->cur_unit->method_name = (yyvsp[(3) - (4)].s);
IMCC_INFO(interp)->cur_unit->is_method = 1;
- ;}
+ }
break;
case 68:
@@ -3640,7 +3640,7 @@
(yyval.t) = 0;
IMCC_INFO(interp)->cur_unit->ns_entry_name = NULL;
IMCC_INFO(interp)->cur_unit->has_ns_entry_name = 1;
- ;}
+ }
break;
case 69:
@@ -3649,7 +3649,7 @@
(yyval.t) = 0;
IMCC_INFO(interp)->cur_unit->ns_entry_name = (yyvsp[(3) - (4)].s);
IMCC_INFO(interp)->cur_unit->has_ns_entry_name = 1;
- ;}
+ }
break;
case 70:
@@ -3657,7 +3657,7 @@
{
(yyval.t) = 0;
IMCC_INFO(interp)->cur_unit->instance_of = (yyvsp[(3) - (4)].s);
- ;}
+ }
break;
case 71:
@@ -3665,7 +3665,7 @@
{
(yyval.t) = 0;
IMCC_INFO(interp)->cur_unit->subid = NULL;
- ;}
+ }
break;
case 72:
@@ -3675,14 +3675,14 @@
IMCC_INFO(interp)->cur_unit->subid = mk_const(interp, (yyvsp[(3) - (4)].s), 'S');
IMCC_INFO(interp)->cur_unit->instructions->symregs[0]->subid = str_dup_remove_quotes((yyvsp[(3) - (4)].s));
mem_sys_free((yyvsp[(3) - (4)].s));
- ;}
+ }
break;
case 73:
#line 1496 "compilers/imcc/imcc.y"
{
add_pcc_multi(IMCC_INFO(interp)->cur_call, NULL);
- ;}
+ }
break;
case 74:
@@ -3690,7 +3690,7 @@
{
(yyval.t) = 0;
add_pcc_multi(IMCC_INFO(interp)->cur_call, (yyvsp[(3) - (3)].sr));
- ;}
+ }
break;
case 75:
@@ -3698,27 +3698,27 @@
{
(yyval.t) = 0;
add_pcc_multi(IMCC_INFO(interp)->cur_call, (yyvsp[(1) - (1)].sr));
- ;}
+ }
break;
case 76:
#line 1512 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_const(interp, "INTVAL", 'S'); ;}
+ { (yyval.sr) = mk_const(interp, "INTVAL", 'S'); }
break;
case 77:
#line 1513 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_const(interp, "FLOATVAL", 'S'); ;}
+ { (yyval.sr) = mk_const(interp, "FLOATVAL", 'S'); }
break;
case 78:
#line 1514 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_const(interp, "PMC", 'S'); ;}
+ { (yyval.sr) = mk_const(interp, "PMC", 'S'); }
break;
case 79:
#line 1515 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_const(interp, "STRING", 'S'); ;}
+ { (yyval.sr) = mk_const(interp, "STRING", 'S'); }
break;
case 80:
@@ -3732,7 +3732,7 @@
}
mem_sys_free((yyvsp[(1) - (1)].s));
(yyval.sr) = r;
- ;}
+ }
break;
case 81:
@@ -3746,12 +3746,12 @@
}
mem_sys_free((yyvsp[(1) - (1)].s));
(yyval.sr) = r;
- ;}
+ }
break;
case 82:
#line 1538 "compilers/imcc/imcc.y"
- { (yyval.sr) = (yyvsp[(2) - (3)].sr); ;}
+ { (yyval.sr) = (yyvsp[(2) - (3)].sr); }
break;
case 85:
@@ -3778,82 +3778,82 @@
r1 = IMCC_INFO(interp)->cur_unit->instructions->symregs[0];
if (r1 && r1->pcc_sub)
r1->pcc_sub->calls_a_sub |= 1;
- ;}
+ }
break;
case 86:
#line 1576 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; IMCC_INFO(interp)->cur_call = NULL; ;}
+ { (yyval.i) = 0; IMCC_INFO(interp)->cur_call = NULL; }
break;
case 87:
#line 1580 "compilers/imcc/imcc.y"
- { (yyval.i) = NULL; IMCC_INFO(interp)->cur_call->pcc_sub->label = 0; ;}
+ { (yyval.i) = NULL; IMCC_INFO(interp)->cur_call->pcc_sub->label = 0; }
break;
case 88:
#line 1581 "compilers/imcc/imcc.y"
- { (yyval.i) = NULL; IMCC_INFO(interp)->cur_call->pcc_sub->label = 1; ;}
+ { (yyval.i) = NULL; IMCC_INFO(interp)->cur_call->pcc_sub->label = 1; }
break;
case 89:
#line 1585 "compilers/imcc/imcc.y"
- { (yyval.i) = NULL; ;}
+ { (yyval.i) = NULL; }
break;
case 90:
#line 1586 "compilers/imcc/imcc.y"
- { (yyval.i) = NULL; IMCC_INFO(interp)->cur_call->pcc_sub->object = (yyvsp[(2) - (3)].sr); ;}
+ { (yyval.i) = NULL; IMCC_INFO(interp)->cur_call->pcc_sub->object = (yyvsp[(2) - (3)].sr); }
break;
case 91:
#line 1590 "compilers/imcc/imcc.y"
- { (yyval.t) = 0; ;}
+ { (yyval.t) = 0; }
break;
case 93:
#line 1595 "compilers/imcc/imcc.y"
- { (yyval.t) = (yyvsp[(1) - (1)].t); ;}
+ { (yyval.t) = (yyvsp[(1) - (1)].t); }
break;
case 94:
#line 1596 "compilers/imcc/imcc.y"
- { (yyval.t) = (yyvsp[(1) - (2)].t) | (yyvsp[(2) - (2)].t); ;}
+ { (yyval.t) = (yyvsp[(1) - (2)].t) | (yyvsp[(2) - (2)].t); }
break;
case 95:
#line 1600 "compilers/imcc/imcc.y"
- { (yyval.t) = P_LOAD; ;}
+ { (yyval.t) = P_LOAD; }
break;
case 96:
#line 1601 "compilers/imcc/imcc.y"
- { (yyval.t) = P_INIT; ;}
+ { (yyval.t) = P_INIT; }
break;
case 97:
#line 1602 "compilers/imcc/imcc.y"
- { (yyval.t) = P_MAIN; ;}
+ { (yyval.t) = P_MAIN; }
break;
case 98:
#line 1603 "compilers/imcc/imcc.y"
- { (yyval.t) = P_IMMEDIATE; ;}
+ { (yyval.t) = P_IMMEDIATE; }
break;
case 99:
#line 1604 "compilers/imcc/imcc.y"
- { (yyval.t) = P_POSTCOMP; ;}
+ { (yyval.t) = P_POSTCOMP; }
break;
case 100:
#line 1605 "compilers/imcc/imcc.y"
- { (yyval.t) = P_ANON; ;}
+ { (yyval.t) = P_ANON; }
break;
case 101:
#line 1606 "compilers/imcc/imcc.y"
- { (yyval.t) = P_NEED_LEX; ;}
+ { (yyval.t) = P_NEED_LEX; }
break;
case 109:
@@ -3861,14 +3861,14 @@
{
add_pcc_sub(IMCC_INFO(interp)->cur_call, (yyvsp[(2) - (5)].sr));
add_pcc_cc(IMCC_INFO(interp)->cur_call, (yyvsp[(4) - (5)].sr));
- ;}
+ }
break;
case 110:
#line 1623 "compilers/imcc/imcc.y"
{
add_pcc_sub(IMCC_INFO(interp)->cur_call, (yyvsp[(2) - (3)].sr));
- ;}
+ }
break;
case 111:
@@ -3876,21 +3876,21 @@
{
add_pcc_sub(IMCC_INFO(interp)->cur_call, (yyvsp[(2) - (3)].sr));
IMCC_INFO(interp)->cur_call->pcc_sub->flags |= isNCI;
- ;}
+ }
break;
case 112:
#line 1632 "compilers/imcc/imcc.y"
{
add_pcc_sub(IMCC_INFO(interp)->cur_call, (yyvsp[(2) - (3)].sr));
- ;}
+ }
break;
case 113:
#line 1636 "compilers/imcc/imcc.y"
{
add_pcc_sub(IMCC_INFO(interp)->cur_call, mk_const(interp, (yyvsp[(2) - (3)].s), 'S'));
- ;}
+ }
break;
case 114:
@@ -3898,7 +3898,7 @@
{
add_pcc_sub(IMCC_INFO(interp)->cur_call, (yyvsp[(2) - (5)].sr));
add_pcc_cc(IMCC_INFO(interp)->cur_call, (yyvsp[(4) - (5)].sr));
- ;}
+ }
break;
case 115:
@@ -3906,27 +3906,27 @@
{
add_pcc_sub(IMCC_INFO(interp)->cur_call, mk_const(interp, (yyvsp[(2) - (5)].s), 'S'));
add_pcc_cc(IMCC_INFO(interp)->cur_call, (yyvsp[(4) - (5)].sr));
- ;}
+ }
break;
case 116:
#line 1653 "compilers/imcc/imcc.y"
- { (yyval.sr) = 0; ;}
+ { (yyval.sr) = 0; }
break;
case 117:
#line 1654 "compilers/imcc/imcc.y"
- { add_pcc_arg(IMCC_INFO(interp)->cur_call, (yyvsp[(2) - (3)].sr)); ;}
+ { add_pcc_arg(IMCC_INFO(interp)->cur_call, (yyvsp[(2) - (3)].sr)); }
break;
case 118:
#line 1658 "compilers/imcc/imcc.y"
- { (yyval.sr) = (yyvsp[(2) - (2)].sr); ;}
+ { (yyval.sr) = (yyvsp[(2) - (2)].sr); }
break;
case 119:
#line 1663 "compilers/imcc/imcc.y"
- { (yyval.sr) = 0; ;}
+ { (yyval.sr) = 0; }
break;
case 120:
@@ -3934,17 +3934,17 @@
{
if ((yyvsp[(2) - (3)].sr))
add_pcc_result(IMCC_INFO(interp)->cur_call, (yyvsp[(2) - (3)].sr));
- ;}
+ }
break;
case 121:
#line 1672 "compilers/imcc/imcc.y"
- { (yyval.sr) = (yyvsp[(2) - (3)].sr); (yyval.sr)->type |= (yyvsp[(3) - (3)].t); ;}
+ { (yyval.sr) = (yyvsp[(2) - (3)].sr); (yyval.sr)->type |= (yyvsp[(3) - (3)].t); }
break;
case 122:
#line 1673 "compilers/imcc/imcc.y"
- { IMCC_INFO(interp)->is_def = 1; ;}
+ { IMCC_INFO(interp)->is_def = 1; }
break;
case 123:
@@ -3959,62 +3959,62 @@
UNUSED(ignored);
IMCC_INFO(interp)->is_def = 0;
(yyval.sr) = 0;
- ;}
+ }
break;
case 124:
#line 1688 "compilers/imcc/imcc.y"
- { (yyval.t) = 0; ;}
+ { (yyval.t) = 0; }
break;
case 125:
#line 1689 "compilers/imcc/imcc.y"
- { (yyval.t) = (yyvsp[(1) - (2)].t) | (yyvsp[(2) - (2)].t); ;}
+ { (yyval.t) = (yyvsp[(1) - (2)].t) | (yyvsp[(2) - (2)].t); }
break;
case 126:
#line 1693 "compilers/imcc/imcc.y"
- { (yyval.t) = VT_FLAT; ;}
+ { (yyval.t) = VT_FLAT; }
break;
case 127:
#line 1694 "compilers/imcc/imcc.y"
- { (yyval.t) = VT_OPTIONAL; ;}
+ { (yyval.t) = VT_OPTIONAL; }
break;
case 128:
#line 1695 "compilers/imcc/imcc.y"
- { (yyval.t) = VT_OPT_FLAG; ;}
+ { (yyval.t) = VT_OPT_FLAG; }
break;
case 129:
#line 1696 "compilers/imcc/imcc.y"
- { (yyval.t) = VT_NAMED; ;}
+ { (yyval.t) = VT_NAMED; }
break;
case 130:
#line 1697 "compilers/imcc/imcc.y"
- { adv_named_set(interp, (yyvsp[(3) - (4)].s)); (yyval.t) = 0; mem_sys_free((yyvsp[(3) - (4)].s)); ;}
+ { adv_named_set(interp, (yyvsp[(3) - (4)].s)); (yyval.t) = 0; mem_sys_free((yyvsp[(3) - (4)].s)); }
break;
case 131:
#line 1698 "compilers/imcc/imcc.y"
- { adv_named_set_u(interp, (yyvsp[(3) - (4)].s)); (yyval.t) = 0; mem_sys_free((yyvsp[(3) - (4)].s)); ;}
+ { adv_named_set_u(interp, (yyvsp[(3) - (4)].s)); (yyval.t) = 0; mem_sys_free((yyvsp[(3) - (4)].s)); }
break;
case 132:
#line 1699 "compilers/imcc/imcc.y"
- { (yyval.t) = VT_UNIQUE_REG; ;}
+ { (yyval.t) = VT_UNIQUE_REG; }
break;
case 133:
#line 1704 "compilers/imcc/imcc.y"
- { begin_return_or_yield(interp, 0); ;}
+ { begin_return_or_yield(interp, 0); }
break;
case 134:
#line 1706 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; IMCC_INFO(interp)->asm_state = AsmDefault; ;}
+ { (yyval.i) = 0; IMCC_INFO(interp)->asm_state = AsmDefault; }
break;
case 135:
@@ -4022,22 +4022,22 @@
{
IMCC_INFO(interp)->asm_state = AsmDefault;
(yyval.i) = 0;
- ;}
+ }
break;
case 136:
#line 1715 "compilers/imcc/imcc.y"
- { begin_return_or_yield(interp, 1); ;}
+ { begin_return_or_yield(interp, 1); }
break;
case 137:
#line 1717 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; IMCC_INFO(interp)->asm_state = AsmDefault; ;}
+ { (yyval.i) = 0; IMCC_INFO(interp)->asm_state = AsmDefault; }
break;
case 138:
#line 1721 "compilers/imcc/imcc.y"
- { (yyval.sr) = 0; ;}
+ { (yyval.sr) = 0; }
break;
case 139:
@@ -4045,7 +4045,7 @@
{
if ((yyvsp[(1) - (2)].sr))
add_pcc_result(IMCC_INFO(interp)->sr_return, (yyvsp[(1) - (2)].sr));
- ;}
+ }
break;
case 140:
@@ -4053,12 +4053,12 @@
{
if ((yyvsp[(2) - (3)].sr))
add_pcc_result(IMCC_INFO(interp)->sr_return, (yyvsp[(2) - (3)].sr));
- ;}
+ }
break;
case 141:
#line 1735 "compilers/imcc/imcc.y"
- { (yyval.sr) = 0; ;}
+ { (yyval.sr) = 0; }
break;
case 142:
@@ -4066,7 +4066,7 @@
{
if ((yyvsp[(1) - (2)].sr))
add_pcc_result(IMCC_INFO(interp)->sr_return, (yyvsp[(1) - (2)].sr));
- ;}
+ }
break;
case 143:
@@ -4074,17 +4074,17 @@
{
if ((yyvsp[(2) - (3)].sr))
add_pcc_result(IMCC_INFO(interp)->sr_return, (yyvsp[(2) - (3)].sr));
- ;}
+ }
break;
case 144:
#line 1749 "compilers/imcc/imcc.y"
- { (yyval.sr) = (yyvsp[(2) - (3)].sr); (yyval.sr)->type |= (yyvsp[(3) - (3)].t); ;}
+ { (yyval.sr) = (yyvsp[(2) - (3)].sr); (yyval.sr)->type |= (yyvsp[(3) - (3)].t); }
break;
case 145:
#line 1753 "compilers/imcc/imcc.y"
- { (yyval.sr) = (yyvsp[(2) - (3)].sr); (yyval.sr)->type |= (yyvsp[(3) - (3)].t); ;}
+ { (yyval.sr) = (yyvsp[(2) - (3)].sr); (yyval.sr)->type |= (yyvsp[(3) - (3)].t); }
break;
case 146:
@@ -4092,7 +4092,7 @@
{
if (IMCC_INFO(interp)->asm_state == AsmDefault)
begin_return_or_yield(interp, (yyvsp[(1) - (2)].t));
- ;}
+ }
break;
case 147:
@@ -4100,22 +4100,22 @@
{
IMCC_INFO(interp)->asm_state = AsmDefault;
(yyval.t) = 0;
- ;}
+ }
break;
case 148:
#line 1770 "compilers/imcc/imcc.y"
- { (yyval.t) = 0; ;}
+ { (yyval.t) = 0; }
break;
case 149:
#line 1771 "compilers/imcc/imcc.y"
- { (yyval.t) = 1; ;}
+ { (yyval.t) = 1; }
break;
case 150:
#line 1775 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; ;}
+ { (yyval.i) = 0; }
break;
case 151:
@@ -4128,7 +4128,7 @@
}
else
add_pcc_result(IMCC_INFO(interp)->sr_return, (yyvsp[(1) - (1)].sr));
- ;}
+ }
break;
case 152:
@@ -4136,7 +4136,7 @@
{
SymReg * const name = mk_const(interp, (yyvsp[(1) - (3)].s), 'S');
add_pcc_named_return(IMCC_INFO(interp)->sr_return, name, (yyvsp[(3) - (3)].sr));
- ;}
+ }
break;
case 153:
@@ -4149,7 +4149,7 @@
}
else
add_pcc_result(IMCC_INFO(interp)->sr_return, (yyvsp[(3) - (3)].sr));
- ;}
+ }
break;
case 154:
@@ -4157,47 +4157,47 @@
{
SymReg * const name = mk_const(interp, (yyvsp[(3) - (5)].s), 'S');
add_pcc_named_return(IMCC_INFO(interp)->sr_return, name, (yyvsp[(5) - (5)].sr));
- ;}
+ }
break;
case 157:
#line 1823 "compilers/imcc/imcc.y"
- { clear_state(interp); ;}
+ { clear_state(interp); }
break;
case 158:
#line 1828 "compilers/imcc/imcc.y"
- { (yyval.i) = (yyvsp[(2) - (2)].i); ;}
+ { (yyval.i) = (yyvsp[(2) - (2)].i); }
break;
case 159:
#line 1829 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; ;}
+ { (yyval.i) = 0; }
break;
case 160:
#line 1830 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; ;}
+ { (yyval.i) = 0; }
break;
case 161:
#line 1831 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; ;}
+ { (yyval.i) = 0; }
break;
case 162:
#line 1832 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; ;}
+ { (yyval.i) = 0; }
break;
case 163:
#line 1833 "compilers/imcc/imcc.y"
- { (yyval.i) = (yyvsp[(1) - (1)].i); ;}
+ { (yyval.i) = (yyvsp[(1) - (1)].i); }
break;
case 164:
#line 1837 "compilers/imcc/imcc.y"
- { (yyval.i) = NULL; ;}
+ { (yyval.i) = NULL; }
break;
case 168:
@@ -4206,12 +4206,12 @@
Instruction * const i = iLABEL(interp, IMCC_INFO(interp)->cur_unit, mk_local_label(interp, (yyvsp[(1) - (1)].s)));
mem_sys_free((yyvsp[(1) - (1)].s));
(yyval.i) = i;
- ;}
+ }
break;
case 169:
#line 1858 "compilers/imcc/imcc.y"
- { (yyval.i) = (yyvsp[(2) - (3)].i); ;}
+ { (yyval.i) = (yyvsp[(2) - (3)].i); }
break;
case 170:
@@ -4222,7 +4222,7 @@
YYABORT;
}
yyerrok;
- ;}
+ }
break;
case 171:
@@ -4231,7 +4231,7 @@
IdList* const l = (yyvsp[(1) - (1)].idlist);
l->next = NULL;
(yyval.idlist) = l;
- ;}
+ }
break;
case 172:
@@ -4240,7 +4240,7 @@
IdList* const l = (yyvsp[(3) - (3)].idlist);
l->next = (yyvsp[(1) - (3)].idlist);
(yyval.idlist) = l;
- ;}
+ }
break;
case 173:
@@ -4250,22 +4250,22 @@
l->id = (yyvsp[(1) - (2)].s);
l->unique_reg = (yyvsp[(2) - (2)].t);
(yyval.idlist) = l;
- ;}
+ }
break;
case 174:
#line 1896 "compilers/imcc/imcc.y"
- { (yyval.t) = 0; ;}
+ { (yyval.t) = 0; }
break;
case 175:
#line 1897 "compilers/imcc/imcc.y"
- { (yyval.t) = 1; ;}
+ { (yyval.t) = 1; }
break;
case 178:
#line 1904 "compilers/imcc/imcc.y"
- { IMCC_INFO(interp)->is_def = 1; ;}
+ { IMCC_INFO(interp)->is_def = 1; }
break;
case 179:
@@ -4284,7 +4284,7 @@
mem_sys_free(l1);
}
IMCC_INFO(interp)->is_def = 0; (yyval.i) = 0;
- ;}
+ }
break;
case 180:
@@ -4297,7 +4297,7 @@
set_lexical(interp, (yyvsp[(4) - (4)].sr), n); (yyval.i) = 0;
mem_sys_free((yyvsp[(2) - (4)].s));
mem_sys_free(name);
- ;}
+ }
break;
case 181:
@@ -4306,12 +4306,12 @@
SymReg *n = mk_const(interp, (yyvsp[(2) - (4)].s), 'U');
set_lexical(interp, (yyvsp[(4) - (4)].sr), n); (yyval.i) = 0;
mem_sys_free((yyvsp[(2) - (4)].s));
- ;}
+ }
break;
case 182:
#line 1936 "compilers/imcc/imcc.y"
- { IMCC_INFO(interp)->is_def = 1; ;}
+ { IMCC_INFO(interp)->is_def = 1; }
break;
case 183:
@@ -4320,12 +4320,12 @@
mk_const_ident(interp, (yyvsp[(4) - (6)].s), (yyvsp[(3) - (6)].t), (yyvsp[(6) - (6)].sr), 0);
IMCC_INFO(interp)->is_def = 0;
mem_sys_free((yyvsp[(4) - (6)].s));
- ;}
+ }
break;
case 185:
#line 1944 "compilers/imcc/imcc.y"
- { IMCC_INFO(interp)->is_def = 1; ;}
+ { IMCC_INFO(interp)->is_def = 1; }
break;
case 186:
@@ -4334,7 +4334,7 @@
mk_const_ident(interp, (yyvsp[(4) - (6)].s), (yyvsp[(3) - (6)].t), (yyvsp[(6) - (6)].sr), 1);
IMCC_INFO(interp)->is_def = 0;
mem_sys_free((yyvsp[(4) - (6)].s));
- ;}
+ }
break;
case 187:
@@ -4343,14 +4343,14 @@
(yyval.i) = NULL;
IMCC_INFO(interp)->cur_call->pcc_sub->flags |= isTAIL_CALL;
IMCC_INFO(interp)->cur_call = NULL;
- ;}
+ }
break;
case 188:
#line 1957 "compilers/imcc/imcc.y"
{
(yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "branch", 1, (yyvsp[(2) - (2)].sr));
- ;}
+ }
break;
case 189:
@@ -4365,47 +4365,47 @@
IMCC_INFO(interp)->keyvec,
1);
mem_sys_free((yyvsp[(1) - (2)].s));
- ;}
+ }
break;
case 190:
#line 1972 "compilers/imcc/imcc.y"
- { (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "null", 1, (yyvsp[(2) - (2)].sr)); ;}
+ { (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "null", 1, (yyvsp[(2) - (2)].sr)); }
break;
case 191:
#line 1973 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; IMCC_INFO(interp)->cur_call = NULL; ;}
+ { (yyval.i) = 0; IMCC_INFO(interp)->cur_call = NULL; }
break;
case 192:
#line 1974 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; ;}
+ { (yyval.i) = 0; }
break;
case 195:
#line 1977 "compilers/imcc/imcc.y"
- { (yyval.i) = 0;;}
+ { (yyval.i) = 0;}
break;
case 196:
#line 1981 "compilers/imcc/imcc.y"
- { (yyval.t) = 'I'; ;}
+ { (yyval.t) = 'I'; }
break;
case 197:
#line 1982 "compilers/imcc/imcc.y"
- { (yyval.t) = 'N'; ;}
+ { (yyval.t) = 'N'; }
break;
case 198:
#line 1983 "compilers/imcc/imcc.y"
- { (yyval.t) = 'S'; ;}
+ { (yyval.t) = 'S'; }
break;
case 199:
#line 1984 "compilers/imcc/imcc.y"
- { (yyval.t) = 'P'; ;}
+ { (yyval.t) = 'P'; }
break;
case 200:
@@ -4418,37 +4418,37 @@
IMCC_fataly(interp, EXCEPTION_SYNTAX_ERROR,
"Unknown PMC type '%s'\n", (yyvsp[(1) - (1)].s));
}
- ;}
+ }
break;
case 201:
#line 2002 "compilers/imcc/imcc.y"
- { (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "set", 2, (yyvsp[(1) - (3)].sr), (yyvsp[(3) - (3)].sr)); ;}
+ { (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "set", 2, (yyvsp[(1) - (3)].sr), (yyvsp[(3) - (3)].sr)); }
break;
case 202:
#line 2004 "compilers/imcc/imcc.y"
- { (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(3) - (4)].s), 2, (yyvsp[(1) - (4)].sr), (yyvsp[(4) - (4)].sr)); ;}
+ { (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(3) - (4)].s), 2, (yyvsp[(1) - (4)].sr), (yyvsp[(4) - (4)].sr)); }
break;
case 203:
#line 2006 "compilers/imcc/imcc.y"
- { (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(4) - (5)].s), 3, (yyvsp[(1) - (5)].sr), (yyvsp[(3) - (5)].sr), (yyvsp[(5) - (5)].sr)); ;}
+ { (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(4) - (5)].s), 3, (yyvsp[(1) - (5)].sr), (yyvsp[(3) - (5)].sr), (yyvsp[(5) - (5)].sr)); }
break;
case 204:
#line 2008 "compilers/imcc/imcc.y"
- { (yyval.i) = iINDEXFETCH(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(1) - (6)].sr), (yyvsp[(3) - (6)].sr), (yyvsp[(5) - (6)].sr)); ;}
+ { (yyval.i) = iINDEXFETCH(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(1) - (6)].sr), (yyvsp[(3) - (6)].sr), (yyvsp[(5) - (6)].sr)); }
break;
case 205:
#line 2010 "compilers/imcc/imcc.y"
- { (yyval.i) = iINDEXSET(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(1) - (6)].sr), (yyvsp[(3) - (6)].sr), (yyvsp[(6) - (6)].sr)); ;}
+ { (yyval.i) = iINDEXSET(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(1) - (6)].sr), (yyvsp[(3) - (6)].sr), (yyvsp[(6) - (6)].sr)); }
break;
case 206:
#line 2015 "compilers/imcc/imcc.y"
- { (yyval.i) = iNEW(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(1) - (7)].sr), (yyvsp[(4) - (7)].s), (yyvsp[(6) - (7)].sr), 1); ;}
+ { (yyval.i) = iNEW(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(1) - (7)].sr), (yyvsp[(4) - (7)].s), (yyvsp[(6) - (7)].sr), 1); }
break;
case 207:
@@ -4457,14 +4457,14 @@
add_pcc_result((yyvsp[(3) - (3)].i)->symregs[0], (yyvsp[(1) - (3)].sr));
IMCC_INFO(interp)->cur_call = NULL;
(yyval.i) = 0;
- ;}
+ }
break;
case 208:
#line 2024 "compilers/imcc/imcc.y"
{
(yyval.i) = IMCC_create_itcall_label(interp);
- ;}
+ }
break;
case 209:
@@ -4472,144 +4472,144 @@
{
IMCC_itcall_sub(interp, (yyvsp[(6) - (9)].sr));
IMCC_INFO(interp)->cur_call = NULL;
- ;}
+ }
break;
case 213:
#line 2036 "compilers/imcc/imcc.y"
{
(yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "null", 1, (yyvsp[(1) - (3)].sr));
- ;}
+ }
break;
case 214:
#line 2043 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"not"; ;}
+ { (yyval.s) = (char *)"not"; }
break;
case 215:
#line 2044 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"bnot"; ;}
+ { (yyval.s) = (char *)"bnot"; }
break;
case 216:
#line 2045 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"neg"; ;}
+ { (yyval.s) = (char *)"neg"; }
break;
case 217:
#line 2049 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"sub"; ;}
+ { (yyval.s) = (char *)"sub"; }
break;
case 218:
#line 2050 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"add"; ;}
+ { (yyval.s) = (char *)"add"; }
break;
case 219:
#line 2051 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"mul"; ;}
+ { (yyval.s) = (char *)"mul"; }
break;
case 220:
#line 2052 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"div"; ;}
+ { (yyval.s) = (char *)"div"; }
break;
case 221:
#line 2053 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"mod"; ;}
+ { (yyval.s) = (char *)"mod"; }
break;
case 222:
#line 2054 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"fdiv"; ;}
+ { (yyval.s) = (char *)"fdiv"; }
break;
case 223:
#line 2055 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"pow"; ;}
+ { (yyval.s) = (char *)"pow"; }
break;
case 224:
#line 2056 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"concat"; ;}
+ { (yyval.s) = (char *)"concat"; }
break;
case 225:
#line 2057 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"iseq"; ;}
+ { (yyval.s) = (char *)"iseq"; }
break;
case 226:
#line 2058 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"isne"; ;}
+ { (yyval.s) = (char *)"isne"; }
break;
case 227:
#line 2059 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"isgt"; ;}
+ { (yyval.s) = (char *)"isgt"; }
break;
case 228:
#line 2060 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"isge"; ;}
+ { (yyval.s) = (char *)"isge"; }
break;
case 229:
#line 2061 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"islt"; ;}
+ { (yyval.s) = (char *)"islt"; }
break;
case 230:
#line 2062 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"isle"; ;}
+ { (yyval.s) = (char *)"isle"; }
break;
case 231:
#line 2063 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"shl"; ;}
+ { (yyval.s) = (char *)"shl"; }
break;
case 232:
#line 2064 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"shr"; ;}
+ { (yyval.s) = (char *)"shr"; }
break;
case 233:
#line 2065 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"lsr"; ;}
+ { (yyval.s) = (char *)"lsr"; }
break;
case 234:
#line 2066 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"and"; ;}
+ { (yyval.s) = (char *)"and"; }
break;
case 235:
#line 2067 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"or"; ;}
+ { (yyval.s) = (char *)"or"; }
break;
case 236:
#line 2068 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"xor"; ;}
+ { (yyval.s) = (char *)"xor"; }
break;
case 237:
#line 2069 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"band"; ;}
+ { (yyval.s) = (char *)"band"; }
break;
case 238:
#line 2070 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"bor"; ;}
+ { (yyval.s) = (char *)"bor"; }
break;
case 239:
#line 2071 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"bxor"; ;}
+ { (yyval.s) = (char *)"bxor"; }
break;
case 240:
@@ -4618,84 +4618,84 @@
(yyval.i) = IMCC_create_itcall_label(interp);
(yyval.i)->type &= ~ITCALL;
(yyval.i)->type |= ITRESULT;
- ;}
+ }
break;
case 241:
#line 2082 "compilers/imcc/imcc.y"
- { (yyval.i) = 0; ;}
+ { (yyval.i) = 0; }
break;
case 242:
#line 2089 "compilers/imcc/imcc.y"
{
(yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(2) - (3)].s), 2, (yyvsp[(1) - (3)].sr), (yyvsp[(3) - (3)].sr));
- ;}
+ }
break;
case 243:
#line 2095 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"add"; ;}
+ { (yyval.s) = (char *)"add"; }
break;
case 244:
#line 2096 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"sub"; ;}
+ { (yyval.s) = (char *)"sub"; }
break;
case 245:
#line 2097 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"mul"; ;}
+ { (yyval.s) = (char *)"mul"; }
break;
case 246:
#line 2098 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"div"; ;}
+ { (yyval.s) = (char *)"div"; }
break;
case 247:
#line 2099 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"mod"; ;}
+ { (yyval.s) = (char *)"mod"; }
break;
case 248:
#line 2100 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"fdiv"; ;}
+ { (yyval.s) = (char *)"fdiv"; }
break;
case 249:
#line 2101 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"concat"; ;}
+ { (yyval.s) = (char *)"concat"; }
break;
case 250:
#line 2102 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"band"; ;}
+ { (yyval.s) = (char *)"band"; }
break;
case 251:
#line 2103 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"bor"; ;}
+ { (yyval.s) = (char *)"bor"; }
break;
case 252:
#line 2104 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"bxor"; ;}
+ { (yyval.s) = (char *)"bxor"; }
break;
case 253:
#line 2105 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"shr"; ;}
+ { (yyval.s) = (char *)"shr"; }
break;
case 254:
#line 2106 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"shl"; ;}
+ { (yyval.s) = (char *)"shl"; }
break;
case 255:
#line 2107 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"lsr"; ;}
+ { (yyval.s) = (char *)"lsr"; }
break;
case 256:
@@ -4706,22 +4706,22 @@
IMCC_INFO(interp) -> nargs,
IMCC_INFO(interp) -> keyvec, 1);
mem_sys_free((yyvsp[(3) - (4)].s));
- ;}
+ }
break;
case 257:
#line 2123 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_sub_address(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); ;}
+ { (yyval.sr) = mk_sub_address(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); }
break;
case 258:
#line 2124 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_sub_address_fromc(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); ;}
+ { (yyval.sr) = mk_sub_address_fromc(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); }
break;
case 259:
#line 2125 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_sub_address_u(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); ;}
+ { (yyval.sr) = mk_sub_address_u(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); }
break;
case 260:
@@ -4730,7 +4730,7 @@
(yyval.sr) = (yyvsp[(1) - (1)].sr);
if ((yyvsp[(1) - (1)].sr)->set != 'P')
IMCC_fataly(interp, EXCEPTION_SYNTAX_ERROR, "Sub isn't a PMC");
- ;}
+ }
break;
case 261:
@@ -4747,7 +4747,7 @@
IMCC_INFO(interp)->cur_obj = (yyvsp[(1) - (3)].sr);
(yyval.sr) = (yyvsp[(3) - (3)].sr);
- ;}
+ }
break;
case 262:
@@ -4756,7 +4756,7 @@
IMCC_INFO(interp)->cur_obj = (yyvsp[(1) - (3)].sr);
(yyval.sr) = mk_const(interp, (yyvsp[(3) - (3)].s), 'U');
mem_sys_free((yyvsp[(3) - (3)].s));
- ;}
+ }
break;
case 263:
@@ -4765,12 +4765,12 @@
IMCC_INFO(interp)->cur_obj = (yyvsp[(1) - (3)].sr);
(yyval.sr) = mk_const(interp, (yyvsp[(3) - (3)].s), 'S');
mem_sys_free((yyvsp[(3) - (3)].s));
- ;}
+ }
break;
case 264:
#line 2158 "compilers/imcc/imcc.y"
- { IMCC_INFO(interp)->cur_obj = (yyvsp[(1) - (3)].sr); (yyval.sr) = (yyvsp[(3) - (3)].sr); ;}
+ { IMCC_INFO(interp)->cur_obj = (yyvsp[(1) - (3)].sr); (yyval.sr) = (yyvsp[(3) - (3)].sr); }
break;
case 265:
@@ -4778,17 +4778,17 @@
{
(yyval.i) = IMCC_create_itcall_label(interp);
IMCC_itcall_sub(interp, (yyvsp[(1) - (1)].sr));
- ;}
+ }
break;
case 266:
#line 2168 "compilers/imcc/imcc.y"
- { (yyval.i) = (yyvsp[(2) - (5)].i); ;}
+ { (yyval.i) = (yyvsp[(2) - (5)].i); }
break;
case 267:
#line 2172 "compilers/imcc/imcc.y"
- { (yyval.sr) = 0; ;}
+ { (yyval.sr) = 0; }
break;
case 268:
@@ -4801,7 +4801,7 @@
}
else
add_pcc_arg(IMCC_INFO(interp)->cur_call, (yyvsp[(3) - (3)].sr));
- ;}
+ }
break;
case 269:
@@ -4814,7 +4814,7 @@
}
else
add_pcc_arg(IMCC_INFO(interp)->cur_call, (yyvsp[(1) - (1)].sr));
- ;}
+ }
break;
case 270:
@@ -4824,7 +4824,7 @@
add_pcc_named_arg(IMCC_INFO(interp)->cur_call,
mk_const(interp, (yyvsp[(3) - (5)].s), 'S'), (yyvsp[(5) - (5)].sr));
mem_sys_free((yyvsp[(3) - (5)].s));
- ;}
+ }
break;
case 271:
@@ -4832,7 +4832,7 @@
{
(yyval.sr) = 0;
add_pcc_named_arg_var(IMCC_INFO(interp)->cur_call, (yyvsp[(1) - (3)].sr), (yyvsp[(3) - (3)].sr));
- ;}
+ }
break;
case 272:
@@ -4842,47 +4842,47 @@
add_pcc_named_arg(IMCC_INFO(interp)->cur_call,
mk_const(interp, (yyvsp[(1) - (3)].s), 'S'), (yyvsp[(3) - (3)].sr));
mem_sys_free((yyvsp[(1) - (3)].s));
- ;}
+ }
break;
case 273:
#line 2215 "compilers/imcc/imcc.y"
- { (yyval.sr) = (yyvsp[(1) - (2)].sr); (yyval.sr)->type |= (yyvsp[(2) - (2)].t); ;}
+ { (yyval.sr) = (yyvsp[(1) - (2)].sr); (yyval.sr)->type |= (yyvsp[(2) - (2)].t); }
break;
case 274:
#line 2219 "compilers/imcc/imcc.y"
- { (yyval.t) = 0; ;}
+ { (yyval.t) = 0; }
break;
case 275:
#line 2220 "compilers/imcc/imcc.y"
- { (yyval.t) = (yyvsp[(1) - (2)].t) | (yyvsp[(2) - (2)].t); ;}
+ { (yyval.t) = (yyvsp[(1) - (2)].t) | (yyvsp[(2) - (2)].t); }
break;
case 276:
#line 2224 "compilers/imcc/imcc.y"
- { (yyval.t) = VT_FLAT; ;}
+ { (yyval.t) = VT_FLAT; }
break;
case 277:
#line 2225 "compilers/imcc/imcc.y"
- { (yyval.t) = VT_NAMED; ;}
+ { (yyval.t) = VT_NAMED; }
break;
case 278:
#line 2228 "compilers/imcc/imcc.y"
- { adv_named_set_u(interp, (yyvsp[(3) - (4)].s)); (yyval.t) = 0; ;}
+ { adv_named_set_u(interp, (yyvsp[(3) - (4)].s)); (yyval.t) = 0; }
break;
case 279:
#line 2229 "compilers/imcc/imcc.y"
- { adv_named_set(interp, (yyvsp[(3) - (4)].s)); (yyval.t) = 0; ;}
+ { adv_named_set(interp, (yyvsp[(3) - (4)].s)); (yyval.t) = 0; }
break;
case 280:
#line 2233 "compilers/imcc/imcc.y"
- { (yyval.sr) = (yyvsp[(1) - (2)].sr); (yyval.sr)->type |= (yyvsp[(2) - (2)].t); ;}
+ { (yyval.sr) = (yyvsp[(1) - (2)].sr); (yyval.sr)->type |= (yyvsp[(2) - (2)].t); }
break;
case 281:
@@ -4895,7 +4895,7 @@
}
else
add_pcc_result(IMCC_INFO(interp)->cur_call, (yyvsp[(3) - (3)].sr));
- ;}
+ }
break;
case 282:
@@ -4904,7 +4904,7 @@
add_pcc_named_result(IMCC_INFO(interp)->cur_call,
mk_const(interp, (yyvsp[(3) - (5)].s), 'S'), (yyvsp[(5) - (5)].sr));
mem_sys_free((yyvsp[(3) - (5)].s));
- ;}
+ }
break;
case 283:
@@ -4917,7 +4917,7 @@
}
else
add_pcc_result(IMCC_INFO(interp)->cur_call, (yyvsp[(1) - (1)].sr));
- ;}
+ }
break;
case 284:
@@ -4925,124 +4925,124 @@
{
add_pcc_named_result(IMCC_INFO(interp)->cur_call, mk_const(interp, (yyvsp[(1) - (3)].s), 'S'), (yyvsp[(3) - (3)].sr));
mem_sys_free((yyvsp[(1) - (3)].s));
- ;}
+ }
break;
case 285:
#line 2268 "compilers/imcc/imcc.y"
- { (yyval.sr) = 0; ;}
+ { (yyval.sr) = 0; }
break;
case 286:
#line 2272 "compilers/imcc/imcc.y"
- { (yyval.i) = (yyvsp[(1) - (1)].i); ;}
+ { (yyval.i) = (yyvsp[(1) - (1)].i); }
break;
case 287:
#line 2273 "compilers/imcc/imcc.y"
- { (yyval.i) = (yyvsp[(1) - (1)].i); ;}
+ { (yyval.i) = (yyvsp[(1) - (1)].i); }
break;
case 288:
#line 2278 "compilers/imcc/imcc.y"
{
(yyval.i) =MK_I(interp, IMCC_INFO(interp)->cur_unit, inv_op((yyvsp[(3) - (6)].s)), 3, (yyvsp[(2) - (6)].sr), (yyvsp[(4) - (6)].sr), (yyvsp[(6) - (6)].sr));
- ;}
+ }
break;
case 289:
#line 2282 "compilers/imcc/imcc.y"
{
(yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "unless_null", 2, (yyvsp[(3) - (5)].sr), (yyvsp[(5) - (5)].sr));
- ;}
+ }
break;
case 290:
#line 2286 "compilers/imcc/imcc.y"
{
(yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "unless", 2, (yyvsp[(2) - (4)].sr), (yyvsp[(4) - (4)].sr));
- ;}
+ }
break;
case 291:
#line 2293 "compilers/imcc/imcc.y"
{
(yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "if", 2, (yyvsp[(2) - (4)].sr), (yyvsp[(4) - (4)].sr));
- ;}
+ }
break;
case 292:
#line 2297 "compilers/imcc/imcc.y"
{
(yyval.i) =MK_I(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(3) - (6)].s), 3, (yyvsp[(2) - (6)].sr), (yyvsp[(4) - (6)].sr), (yyvsp[(6) - (6)].sr));
- ;}
+ }
break;
case 293:
#line 2301 "compilers/imcc/imcc.y"
{
(yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "if_null", 2, (yyvsp[(3) - (5)].sr), (yyvsp[(5) - (5)].sr));
- ;}
+ }
break;
case 294:
#line 2307 "compilers/imcc/imcc.y"
- { (yyval.t) = 0; ;}
+ { (yyval.t) = 0; }
break;
case 295:
#line 2308 "compilers/imcc/imcc.y"
- { (yyval.t) = 0; ;}
+ { (yyval.t) = 0; }
break;
case 296:
#line 2312 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"eq"; ;}
+ { (yyval.s) = (char *)"eq"; }
break;
case 297:
#line 2313 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"ne"; ;}
+ { (yyval.s) = (char *)"ne"; }
break;
case 298:
#line 2314 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"gt"; ;}
+ { (yyval.s) = (char *)"gt"; }
break;
case 299:
#line 2315 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"ge"; ;}
+ { (yyval.s) = (char *)"ge"; }
break;
case 300:
#line 2316 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"lt"; ;}
+ { (yyval.s) = (char *)"lt"; }
break;
case 301:
#line 2317 "compilers/imcc/imcc.y"
- { (yyval.s) = (char *)"le"; ;}
+ { (yyval.s) = (char *)"le"; }
break;
case 304:
#line 2326 "compilers/imcc/imcc.y"
- { (yyval.sr) = NULL; ;}
+ { (yyval.sr) = NULL; }
break;
case 305:
#line 2327 "compilers/imcc/imcc.y"
- { (yyval.sr) = (yyvsp[(1) - (1)].sr); ;}
+ { (yyval.sr) = (yyvsp[(1) - (1)].sr); }
break;
case 306:
#line 2331 "compilers/imcc/imcc.y"
- { (yyval.sr) = IMCC_INFO(interp)->regs[0]; ;}
+ { (yyval.sr) = IMCC_INFO(interp)->regs[0]; }
break;
case 308:
#line 2336 "compilers/imcc/imcc.y"
- { IMCC_INFO(interp)->regs[IMCC_INFO(interp)->nargs++] = (yyvsp[(1) - (1)].sr); ;}
+ { IMCC_INFO(interp)->regs[IMCC_INFO(interp)->nargs++] = (yyvsp[(1) - (1)].sr); }
break;
case 309:
@@ -5052,7 +5052,7 @@
IMCC_INFO(interp) -> keyvec |= KEY_BIT(IMCC_INFO(interp)->nargs);
IMCC_INFO(interp) -> regs[IMCC_INFO(interp)->nargs++] = (yyvsp[(3) - (4)].sr);
(yyval.sr) = (yyvsp[(1) - (4)].sr);
- ;}
+ }
break;
case 310:
@@ -5060,44 +5060,44 @@
{
IMCC_INFO(interp) -> regs[IMCC_INFO(interp)->nargs++] = (yyvsp[(2) - (3)].sr);
(yyval.sr) = (yyvsp[(2) - (3)].sr);
- ;}
+ }
break;
case 312:
#line 2352 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_sub_address_fromc(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); ;}
+ { (yyval.sr) = mk_sub_address_fromc(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); }
break;
case 313:
#line 2353 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_sub_address_u(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); ;}
+ { (yyval.sr) = mk_sub_address_u(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); }
break;
case 314:
#line 2357 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_sub_address(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); ;}
+ { (yyval.sr) = mk_sub_address(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); }
break;
case 315:
#line 2358 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_sub_address(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); ;}
+ { (yyval.sr) = mk_sub_address(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); }
break;
case 316:
#line 2362 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_label_address(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); ;}
+ { (yyval.sr) = mk_label_address(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); }
break;
case 317:
#line 2363 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_label_address(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); ;}
+ { (yyval.sr) = mk_label_address(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); }
break;
case 322:
#line 2377 "compilers/imcc/imcc.y"
{
IMCC_INFO(interp)->nkeys = 0;
- ;}
+ }
break;
case 323:
@@ -5106,14 +5106,14 @@
(yyval.sr) = link_keys(interp,
IMCC_INFO(interp)->nkeys,
IMCC_INFO(interp)->keys, 0);
- ;}
+ }
break;
case 324:
#line 2389 "compilers/imcc/imcc.y"
{
IMCC_INFO(interp)->nkeys = 0;
- ;}
+ }
break;
case 325:
@@ -5122,12 +5122,12 @@
(yyval.sr) = link_keys(interp,
IMCC_INFO(interp)->nkeys,
IMCC_INFO(interp)->keys, 1);
- ;}
+ }
break;
case 326:
#line 2401 "compilers/imcc/imcc.y"
- { IMCC_INFO(interp)->keys[IMCC_INFO(interp)->nkeys++] = (yyvsp[(1) - (1)].sr); ;}
+ { IMCC_INFO(interp)->keys[IMCC_INFO(interp)->nkeys++] = (yyvsp[(1) - (1)].sr); }
break;
case 327:
@@ -5135,59 +5135,59 @@
{
IMCC_INFO(interp)->keys[IMCC_INFO(interp)->nkeys++] = (yyvsp[(3) - (3)].sr);
(yyval.sr) = IMCC_INFO(interp)->keys[0];
- ;}
+ }
break;
case 328:
#line 2411 "compilers/imcc/imcc.y"
{
(yyval.sr) = (yyvsp[(1) - (1)].sr);
- ;}
+ }
break;
case 329:
#line 2417 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_symreg(interp, (yyvsp[(1) - (1)].s), 'I'); ;}
+ { (yyval.sr) = mk_symreg(interp, (yyvsp[(1) - (1)].s), 'I'); }
break;
case 330:
#line 2418 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_symreg(interp, (yyvsp[(1) - (1)].s), 'N'); ;}
+ { (yyval.sr) = mk_symreg(interp, (yyvsp[(1) - (1)].s), 'N'); }
break;
case 331:
#line 2419 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_symreg(interp, (yyvsp[(1) - (1)].s), 'S'); ;}
+ { (yyval.sr) = mk_symreg(interp, (yyvsp[(1) - (1)].s), 'S'); }
break;
case 332:
#line 2420 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_symreg(interp, (yyvsp[(1) - (1)].s), 'P'); ;}
+ { (yyval.sr) = mk_symreg(interp, (yyvsp[(1) - (1)].s), 'P'); }
break;
case 333:
#line 2421 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_pasm_reg(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); ;}
+ { (yyval.sr) = mk_pasm_reg(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); }
break;
case 334:
#line 2425 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_const(interp, (yyvsp[(1) - (1)].s), 'I'); mem_sys_free((yyvsp[(1) - (1)].s)); ;}
+ { (yyval.sr) = mk_const(interp, (yyvsp[(1) - (1)].s), 'I'); mem_sys_free((yyvsp[(1) - (1)].s)); }
break;
case 335:
#line 2426 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_const(interp, (yyvsp[(1) - (1)].s), 'N'); mem_sys_free((yyvsp[(1) - (1)].s)); ;}
+ { (yyval.sr) = mk_const(interp, (yyvsp[(1) - (1)].s), 'N'); mem_sys_free((yyvsp[(1) - (1)].s)); }
break;
case 336:
#line 2427 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_const(interp, (yyvsp[(1) - (1)].s), 'S'); mem_sys_free((yyvsp[(1) - (1)].s)); ;}
+ { (yyval.sr) = mk_const(interp, (yyvsp[(1) - (1)].s), 'S'); mem_sys_free((yyvsp[(1) - (1)].s)); }
break;
case 337:
#line 2428 "compilers/imcc/imcc.y"
- { (yyval.sr) = mk_const(interp, (yyvsp[(1) - (1)].s), 'U'); mem_sys_free((yyvsp[(1) - (1)].s)); ;}
+ { (yyval.sr) = mk_const(interp, (yyvsp[(1) - (1)].s), 'U'); mem_sys_free((yyvsp[(1) - (1)].s)); }
break;
Modified: branches/pmc_sans_unionval/include/parrot/gc_api.h
==============================================================================
--- branches/pmc_sans_unionval/include/parrot/gc_api.h Wed Aug 19 00:21:48 2009 (r40645)
+++ branches/pmc_sans_unionval/include/parrot/gc_api.h Wed Aug 19 00:28:49 2009 (r40646)
@@ -251,15 +251,15 @@
__attribute__nonnull__(2)
FUNC_MODIFIES(*pmc);
-void Parrot_gc_free_pmc_ext(PARROT_INTERP, ARGMOD(PMC *p))
+void Parrot_gc_free_pmc_header(PARROT_INTERP, ARGMOD(PMC *pmc))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
- FUNC_MODIFIES(*p);
+ FUNC_MODIFIES(*pmc);
-void Parrot_gc_free_pmc_header(PARROT_INTERP, ARGMOD(PMC *pmc))
+void Parrot_gc_free_pmc_sync(PARROT_INTERP, ARGMOD(PMC *p))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
- FUNC_MODIFIES(*pmc);
+ FUNC_MODIFIES(*p);
void Parrot_gc_free_string_header(PARROT_INTERP, ARGMOD(STRING *s))
__attribute__nonnull__(1)
@@ -368,9 +368,6 @@
#define ASSERT_ARGS_Parrot_gc_active_sized_buffers \
__attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp)
-#define ASSERT_ARGS_Parrot_gc_add_pmc_ext __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(pmc)
#define ASSERT_ARGS_Parrot_gc_add_pmc_sync __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(pmc)
@@ -421,12 +418,12 @@
#define ASSERT_ARGS_Parrot_gc_free_pmc_attributes __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(pmc)
-#define ASSERT_ARGS_Parrot_gc_free_pmc_ext __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(p)
#define ASSERT_ARGS_Parrot_gc_free_pmc_header __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(pmc)
+#define ASSERT_ARGS_Parrot_gc_free_pmc_sync __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(p)
#define ASSERT_ARGS_Parrot_gc_free_string_header __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(s)
Modified: branches/pmc_sans_unionval/src/gc/api.c
==============================================================================
--- branches/pmc_sans_unionval/src/gc/api.c Wed Aug 19 00:21:48 2009 (r40645)
+++ branches/pmc_sans_unionval/src/gc/api.c Wed Aug 19 00:28:49 2009 (r40646)
@@ -366,7 +366,7 @@
if (PObj_active_destroy_TEST(pmc))
VTABLE_destroy(interp, pmc);
- Parrot_gc_free_pmc_ext(interp, pmc);
+ Parrot_gc_free_pmc_sync(interp, pmc);
PObj_flags_SETTO((PObj *)pmc, PObj_on_free_list_FLAG);
pool->add_free_object(interp, pool, (PObj *)pmc);
@@ -375,7 +375,7 @@
/*
-=item C<void Parrot_gc_free_pmc_ext(PARROT_INTERP, PMC *p)>
+=item C<void Parrot_gc_free_pmc_sync(PARROT_INTERP, PMC *p)>
Frees the C<PMC_EXT> structure attached to a PMC, if it exists.
@@ -384,9 +384,9 @@
*/
void
-Parrot_gc_free_pmc_ext(PARROT_INTERP, ARGMOD(PMC *p))
+Parrot_gc_free_pmc_sync(PARROT_INTERP, ARGMOD(PMC *p))
{
- ASSERT_ARGS(Parrot_gc_free_pmc_ext)
+ ASSERT_ARGS(Parrot_gc_free_pmc_sync)
if (PObj_is_PMC_shared_TEST(p) && PMC_sync(p)) {
MUTEX_DESTROY(PMC_sync(p)->pmc_lock);
Modified: branches/pmc_sans_unionval/src/pmc.c
==============================================================================
--- branches/pmc_sans_unionval/src/pmc.c Wed Aug 19 00:21:48 2009 (r40645)
+++ branches/pmc_sans_unionval/src/pmc.c Wed Aug 19 00:28:49 2009 (r40646)
@@ -791,11 +791,10 @@
* original because we have a singleton. Just set the singleton to
* be our class object, but don't mess with its vtable. */
if ((interp->vtables[type]->flags & VTABLE_PMC_IS_SINGLETON)
- && (_class == _class->vtable->pmc_class)) {
+ && (_class == _class->vtable->pmc_class))
interp->vtables[type]->pmc_class = _class;
- }
else {
- Parrot_gc_free_pmc_ext(interp, _class);
+ Parrot_gc_free_pmc_sync(interp, _class);
gc_flag_CLEAR(is_special_PMC, _class);
PObj_is_PMC_shared_CLEAR(_class);
interp->vtables[type]->pmc_class = _class;
Modified: branches/pmc_sans_unionval/src/pmc_freeze.c
==============================================================================
--- branches/pmc_sans_unionval/src/pmc_freeze.c Wed Aug 19 00:21:48 2009 (r40645)
+++ branches/pmc_sans_unionval/src/pmc_freeze.c Wed Aug 19 00:28:49 2009 (r40646)
@@ -113,10 +113,6 @@
__attribute__nonnull__(1)
__attribute__nonnull__(2);
-static void pmc_add_ext(PARROT_INTERP, ARGIN(PMC *pmc))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
static void push_ascii_integer(PARROT_INTERP, ARGIN(IMAGE_IO *io), INTVAL v)
__attribute__nonnull__(1)
__attribute__nonnull__(2);
@@ -323,9 +319,6 @@
#define ASSERT_ARGS_op_check_size __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(s)
-#define ASSERT_ARGS_pmc_add_ext __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(pmc)
#define ASSERT_ARGS_push_ascii_integer __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(io)
More information about the parrot-commits
mailing list