Skip to content

Commit

Permalink
merge trunk into branch
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.parrot.org/parrot/branches/html_cleanup@48299 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information
@mikehh
mikehh committed Aug 3, 2010
2 parents f5b71d5 + b753ee3 commit 485cd9e
Show file tree
Hide file tree
Showing 95 changed files with 14,582 additions and 15,025 deletions.
5 changes: 2 additions & 3 deletions MANIFEST
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ compilers/imcc/symreg.c [imcc]
compilers/imcc/symreg.h [imcc]
compilers/imcc/unit.h [imcc]
compilers/opsc/Defines.mak [opsc]
compilers/opsc/README.pod []doc
compilers/opsc/Rules.mak [opsc]
compilers/opsc/TODO [opsc]
compilers/opsc/gen/Ops/Compiler/IGNOREME [opsc]
Expand Down Expand Up @@ -626,7 +627,6 @@ examples/languages/abc/t/abc_functions [examples]
examples/languages/abc/t/abc_special_variables [examples]
examples/languages/abc/t/abc_statement [examples]
examples/languages/squaak/MAINTAINER [examples]
examples/languages/squaak/PARROT_REVISION [examples]
examples/languages/squaak/README [examples]
examples/languages/squaak/doc/tutorial_episode_1.pod [examples]
examples/languages/squaak/doc/tutorial_episode_2.pod [examples]
Expand Down Expand Up @@ -2148,8 +2148,7 @@ tools/dev/pbc_header.pl []
tools/dev/pbc_to_exe.pir [devel]
tools/dev/pmcrenumber.pl []
tools/dev/pmctree.pl []
tools/dev/pprof2cg.nqp []
tools/dev/pprof2cg.pl []
tools/dev/pprof2cg.pl [devel]
tools/dev/reconfigure.pl [devel]
tools/dev/search-ops.pl []
tools/dev/svnclobber.pl []
Expand Down
94 changes: 45 additions & 49 deletions compilers/imcc/pbc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ static void fixup_globals(PARROT_INTERP)
__attribute__nonnull__(1);

PARROT_WARN_UNUSED_RESULT
static size_t get_codesize(PARROT_INTERP,
static size_t get_code_size(PARROT_INTERP,
ARGIN(const IMC_Unit *unit),
ARGOUT(size_t *src_lines))
__attribute__nonnull__(1)
Expand Down Expand Up @@ -257,7 +257,7 @@ static void verify_signature(PARROT_INTERP,
, PARROT_ASSERT_ARG(pc))
#define ASSERT_ARGS_fixup_globals __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp))
#define ASSERT_ARGS_get_codesize __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
#define ASSERT_ARGS_get_code_size __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(unit) \
, PARROT_ASSERT_ARG(src_lines))
Expand Down Expand Up @@ -352,14 +352,11 @@ add_const_table(PARROT_INTERP)
const size_t oldcount = interp->code->const_table->const_count;
const size_t newcount = oldcount + 1;

/* Allocate a new constant */
PackFile_Constant *new_constant = PackFile_Constant_new(interp);

/* Update the constant count and reallocate */
if (interp->code->const_table->constants) {
interp->code->const_table->constants =
mem_gc_realloc_n_typed_zeroed(interp, interp->code->const_table->constants,
newcount, oldcount, PackFile_Constant *);
newcount, oldcount, PackFile_Constant);
}
else {
/* initialize rlookup cache */
Expand All @@ -369,10 +366,9 @@ add_const_table(PARROT_INTERP)
(hash_comp_fn)STRING_compare_distinct_cs_enc;

interp->code->const_table->constants =
mem_gc_allocate_n_zeroed_typed(interp, newcount, PackFile_Constant *);
mem_gc_allocate_n_zeroed_typed(interp, newcount, PackFile_Constant);
}

interp->code->const_table->constants[oldcount] = new_constant;
interp->code->const_table->const_count = newcount;

return oldcount;
Expand All @@ -394,7 +390,7 @@ add_const_table_pmc(PARROT_INTERP, ARGIN(PMC *pmc))
{
ASSERT_ARGS(add_const_table_pmc)
const int newitem = add_const_table(interp);
PackFile_Constant * const constant = interp->code->const_table->constants[newitem];
PackFile_Constant * const constant = &interp->code->const_table->constants[newitem];

constant->type = PFC_PMC;
constant->u.key = pmc;
Expand All @@ -418,7 +414,7 @@ add_const_table_key(PARROT_INTERP, ARGIN(PMC *key))
{
ASSERT_ARGS(add_const_table_key)
const int newitem = add_const_table(interp);
PackFile_Constant * const constant = interp->code->const_table->constants[newitem];
PackFile_Constant * const constant = &interp->code->const_table->constants[newitem];

constant->type = PFC_KEY;
constant->u.key = key;
Expand Down Expand Up @@ -630,7 +626,7 @@ store_key_const(PARROT_INTERP, ARGIN(const char *str), int idx)

/*
=item C<static size_t get_codesize(PARROT_INTERP, const IMC_Unit *unit, size_t
=item C<static size_t get_code_size(PARROT_INTERP, const IMC_Unit *unit, size_t
*src_lines)>
Stores globals for later fixup, returning the code size in number of ops.
Expand All @@ -641,9 +637,9 @@ Stores globals for later fixup, returning the code size in number of ops.

PARROT_WARN_UNUSED_RESULT
static size_t
get_codesize(PARROT_INTERP, ARGIN(const IMC_Unit *unit), ARGOUT(size_t *src_lines))
get_code_size(PARROT_INTERP, ARGIN(const IMC_Unit *unit), ARGOUT(size_t *src_lines))
{
ASSERT_ARGS(get_codesize)
ASSERT_ARGS(get_code_size)
Instruction *ins = unit->instructions;
size_t code_size;

Expand All @@ -669,7 +665,7 @@ get_codesize(PARROT_INTERP, ARGIN(const IMC_Unit *unit), ARGOUT(size_t *src_line
else if (ins->opname && *ins->opname) {
(*src_lines)++;
if (ins->opnum < 0)
IMCC_fatal(interp, 1, "get_codesize: "
IMCC_fatal(interp, 1, "get_code_size: "
"no opnum ins#%d %I\n",
ins->index, ins);

Expand All @@ -685,7 +681,7 @@ get_codesize(PARROT_INTERP, ARGIN(const IMC_Unit *unit), ARGOUT(size_t *src_line
code_size += ins->opsize;
}
else if (ins->opsize)
IMCC_fatal(interp, 1, "get_codesize: "
IMCC_fatal(interp, 1, "get_code_size: "
"non instruction with size found\n");
}

Expand Down Expand Up @@ -1062,7 +1058,7 @@ add_const_str(PARROT_INTERP, ARGIN(STRING *s))
/* otherwise... */
{
int k = add_const_table(interp);
PackFile_Constant *constant = table->constants[k];
PackFile_Constant *constant = &table->constants[k];
constant->type = PFC_STRING;
constant->u.string = s;

Expand Down Expand Up @@ -1091,7 +1087,7 @@ add_const_num(PARROT_INTERP, ARGIN_NULLOK(const char *buf))
const int k = add_const_table(interp);
STRING * const s = Parrot_str_new(interp, buf, 0);

PackFile_Constant * const constant = interp->code->const_table->constants[k];
PackFile_Constant * const constant = &interp->code->const_table->constants[k];

constant->type = PFC_NUMBER;
constant->u.number = Parrot_str_to_num(interp, s);
Expand Down Expand Up @@ -1136,7 +1132,7 @@ mk_multi_sig(PARROT_INTERP, ARGIN(const SymReg *r))
r = pcc_sub->multi[i];

if (r->set == 'S') {
STRING * const type_name = ct->constants[r->color]->u.string;
STRING * const type_name = ct->constants[r->color].u.string;
const INTVAL type_num = Parrot_pmc_get_type_str(interp, type_name);

if (type_num == enum_type_undef) {
Expand All @@ -1149,7 +1145,7 @@ mk_multi_sig(PARROT_INTERP, ARGIN(const SymReg *r))
}
else {
PARROT_ASSERT(r->set == 'K');
sig_pmc = ct->constants[r->color]->u.key;
sig_pmc = ct->constants[r->color].u.key;
}

VTABLE_set_pmc_keyed_int(interp, multi_sig, i, sig_pmc);
Expand Down Expand Up @@ -1180,10 +1176,10 @@ create_lexinfo(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(PMC *sub_pmc),
int need_lex)
{
ASSERT_ARGS(create_lexinfo)
PMC *lex_info = NULL;
SymHash *hsh = &unit->hash;
PackFile_Constant **constants = interp->code->const_table->constants;
const INTVAL lex_info_id = Parrot_get_ctx_HLL_type(interp,
PMC *lex_info = NULL;
SymHash *hsh = &unit->hash;
PackFile_Constant *constants = interp->code->const_table->constants;
const INTVAL lex_info_id = Parrot_get_ctx_HLL_type(interp,
enum_class_LexInfo);
unsigned int i;

Expand All @@ -1208,7 +1204,7 @@ create_lexinfo(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(PMC *sub_pmc),
Parrot_Sub_attributes *sub;
PARROT_ASSERT(k >= 0);

lex_name = constants[k]->u.string;
lex_name = constants[k].u.string;
PARROT_ASSERT(PObj_is_string_TEST(lex_name));

PMC_get_sub(interp, sub_pmc, sub);
Expand Down Expand Up @@ -1403,7 +1399,7 @@ add_const_pmc_sub(PARROT_INTERP, ARGMOD(SymReg *r), size_t offs, size_t end)
Sub_comp_get_FLAGS(sub) |= (r->pcc_sub->pragma & SUB_COMP_FLAG_MASK);

r->color = add_const_str(interp, IMCC_string_from_reg(interp, r));
sub->name = ct->constants[r->color]->u.string;
sub->name = ct->constants[r->color].u.string;

/* If the unit has no subid, set the subid to match the name. */
if (!unit->subid)
Expand All @@ -1420,18 +1416,18 @@ add_const_pmc_sub(PARROT_INTERP, ARGMOD(SymReg *r), size_t offs, size_t end)
IMCC_string_from_reg(interp, unit->subid));
}

sub->subid = ct->constants[unit->subid->color]->u.string;
sub->subid = ct->constants[unit->subid->color].u.string;
ns_pmc = NULL;

if (ns_const >= 0 && ns_const < ct->const_count) {
switch (ct->constants[ns_const]->type) {
switch (ct->constants[ns_const].type) {
case PFC_KEY:
ns_pmc = ct->constants[ns_const]->u.key;
ns_pmc = ct->constants[ns_const].u.key;
break;
case PFC_STRING:
ns_pmc = Parrot_pmc_new_constant(interp, enum_class_String);
VTABLE_set_string_native(interp, ns_pmc,
ct->constants[ns_const]->u.string);
ct->constants[ns_const].u.string);
break;
default:
break;
Expand Down Expand Up @@ -1524,8 +1520,8 @@ add_const_pmc_sub(PARROT_INTERP, ARGMOD(SymReg *r), size_t offs, size_t end)

/* store the sub */
{
const int k = add_const_table(interp);
PackFile_Constant * const pfc = ct->constants[k];
const int k = add_const_table(interp);
PackFile_Constant * const pfc = &ct->constants[k];

pfc->type = PFC_PMC;
pfc->u.key = sub_pmc;
Expand Down Expand Up @@ -2150,7 +2146,7 @@ verify_signature(PARROT_INTERP, ARGIN(const Instruction *ins), ARGIN(opcode_t *p
{
ASSERT_ARGS(verify_signature)
PMC *changed_sig = NULL;
PMC * const sig_arr = interp->code->const_table->constants[pc[-1]]->u.key;
PMC * const sig_arr = interp->code->const_table->constants[pc[-1]].u.key;
int needed = 0;
int no_consts = (ins->opnum == PARROT_OP_get_results_pc
|| ins->opnum == PARROT_OP_get_params_pc);
Expand Down Expand Up @@ -2233,50 +2229,50 @@ e_pbc_emit(PARROT_INTERP, SHIM(void *param), ARGIN(const IMC_Unit *unit),

/* first instruction, do initialisation ... */
if (ins == unit->instructions) {
size_t ins_size;
const size_t oldsize = get_old_size(interp,
size_t ins_size, seg_size;
const size_t old_size = get_old_size(interp,
&IMCC_INFO(interp)->ins_line);
const size_t code_size = get_codesize(interp, unit, &ins_size);
const size_t bytes = (oldsize + code_size) * sizeof (opcode_t);
const size_t code_size = get_code_size(interp, unit, &ins_size);
const size_t bytes = (old_size + code_size) * sizeof (opcode_t);

IMCC_debug(interp, DEBUG_PBC, "code_size(ops) %d oldsize %d\n",
code_size, oldsize);
IMCC_debug(interp, DEBUG_PBC, "code_size(ops) %d old_size %d\n",
code_size, old_size);

constant_folding(interp, unit);
store_sub_size(interp, code_size, ins_size);

/* allocate code */
interp->code->base.data = (opcode_t *)
interp->code->base.data = (opcode_t *)
mem_sys_realloc(interp->code->base.data, bytes);

/* reallocating this removes its mmaped-ness; needs encapsulation */
interp->code->base.pf->is_mmap_ped = 0;

interp->code->base.size = oldsize + code_size;
interp->code->base.size = old_size + code_size;

IMCC_INFO(interp)->pc = (opcode_t *)interp->code->base.data + oldsize;
IMCC_INFO(interp)->npc = 0;
IMCC_INFO(interp)->pc = (opcode_t *)interp->code->base.data + old_size;
IMCC_INFO(interp)->npc = 0;

/* FIXME length and multiple subs */
IMCC_INFO(interp)->debug_seg = Parrot_new_debug_seg(interp,
interp->code,
(size_t)IMCC_INFO(interp)->ins_line + ins_size + 1);
seg_size = (size_t)IMCC_INFO(interp)->ins_line + ins_size + 1;
IMCC_INFO(interp)->debug_seg =
Parrot_new_debug_seg(interp, interp->code, seg_size);

Parrot_debug_add_mapping(interp, IMCC_INFO(interp)->debug_seg,
IMCC_INFO(interp)->ins_line, unit->file);
old_size, unit->file);

/* if item is a PCC_SUB entry then store it constants */
if (ins->symregs[0] && ins->symregs[0]->pcc_sub) {
add_const_pmc_sub(interp, ins->symregs[0], oldsize,
oldsize + code_size);
add_const_pmc_sub(interp, ins->symregs[0], old_size,
old_size + code_size);
}
else {
/* need a dummy to hold register usage */
SymReg * const r = mk_sub_label(interp, "(null)");
r->type = VT_PCC_SUB;
r->pcc_sub = mem_gc_allocate_zeroed_typed(interp, pcc_sub_t);

add_const_pmc_sub(interp, r, oldsize, oldsize + code_size);
add_const_pmc_sub(interp, r, old_size, old_size + code_size);
}
}

Expand Down
47 changes: 47 additions & 0 deletions compilers/opsc/README.pod
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Copyright (C) 2010, Parrot Foundation.
# $Id$

=head1 NAME

opsc - An opcode compiler for Parrot

=head1 DESCRIPTION

Ops-to-C is a compiler to generate opcode definition files in C from
Parrot's opcode definition language.

=head1 SYNOPSIS

opsc [-options] <file>

=head1 OPTIONS

=over 4

=item -c, --core

Generate C code for core ops (for use only in building the Parrot VM)

=item -d, --dynamic

Generate C code for dynamic ops in a single file.

=item -q, --quiet

Only report error messages, other messages are silent.

=item -h, --help

Print usage information.

=item -n, --no-lines

Do not print #line directives in generated C code.

=item -g, --debug

Perform all processing but do not write to any files.

=back

=cut
8 changes: 4 additions & 4 deletions compilers/opsc/src/Ops/Trans/C.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ method new() {
:ki("IREG(NUM)"),

:ic("cur_opcode[NUM]"),
:nc("CONST(NUM)->u.number"),
:pc("CONST(NUM)->u.key"),
:sc("CONST(NUM)->u.string"),
:kc("CONST(NUM)->u.key"),
:nc("CONST(NUM).u.number"),
:pc("CONST(NUM).u.key"),
:sc("CONST(NUM).u.string"),
:kc("CONST(NUM).u.key"),
:kic("cur_opcode[NUM]")
);

Expand Down
3 changes: 2 additions & 1 deletion config/auto/icu.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,8 @@ sub _handle_icushared {
else {
# on MacOS X there's sometimes an errornous \c at the end of the
# output line. Remove it.
$icushared =~ s/\s\\c$//;
# see TT #1722
$icushared =~ s/\s\\c\s/ /g;
}
}

Expand Down
Loading

0 comments on commit 485cd9e

Please sign in to comment.