Skip to content

Commit

Permalink
Merge branch 'master' into leto/embed_grant
Browse files Browse the repository at this point in the history
  • Loading branch information
@leto
leto committed Jan 12, 2011
2 parents 26b09c1 + aa66af3 commit f90b118
Show file tree
Hide file tree
Showing 361 changed files with 17,675 additions and 12,031 deletions.
8 changes: 0 additions & 8 deletions Configure.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,18 +358,10 @@ =head2 Parrot Options
Use the given ops files.
=item C<--jitcapable>
Use JIT system.
=item C<--buildframes>
Dynamically build NCI call frames.
=item C<--execcapable>
Use JIT to emit a native executable.
=back
=head2 International Components For Unicode (ICU) Options
Expand Down
42 changes: 36 additions & 6 deletions DEPRECATED.pod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,20 @@ from it do not change.

L<https://trac.parrot.org/parrot/ticket/1754>

=item "Advanced" NCI parameter types [eligible in 3.1]

Many NCI parameter types that implement complex functionalities will be removed.
See ticket for list and replacement suggestions.

L<http://trac.parrot.org/parrot/ticket/1931>

=item FixedPMCArray set_pmc vtable [eligible in 3.1]

set_pmc on FPA will be removed. The assign op, which uses this vtable will cease
to work on this type.

L<http://trac.parrot.org/parrot/ticket/1904>

=back

=head1 Opcodes
Expand Down Expand Up @@ -201,18 +215,25 @@ These will be changed to allow more flexibility in types.

L<https://trac.parrot.org/parrot/ticket/1565>

=item finalize [experimental]

Finalize exception handler, unrolling inner runloops if needed.

L<https://trac.parrot.org/parrot/ticket/1635>

=item logical PMC ops [eligible in 2.7]

These fall out from the logical vtables deprecation.

L<https://trac.parrot.org/parrot/ticket/1655>

=item "constant" PObj [eligible in 3.1]

"constant" PObj (which is never collected) are deprecated. All PMCs and STRINGs
should be properly marked during GC.

Functions C<Parrot_pmc_new_constant>, C<Parrot_pmc_new_constant_noinit>,
C<Parrot_pmc_new_constant_init> and C<Parrot_pmc_new_constant_init_int>
will be removed.

PObj flag C<PObj_constant_FLAG> and related macros will be removed.

L<https://trac.parrot.org/parrot/ticket/1875>

=back

=head1 Bytecode
Expand Down Expand Up @@ -353,6 +374,15 @@ The old string_* functions will be removed.

L<http://trac.parrot.org/parrot/ticket/1809>

=item Old embedding API in src/embed.c

Functions in src/embed.c are deprecated. Functions in that file will
either be deleted outright if they are superfluous, or will be moved and
renamed in a way that is more appropriate. The file src/embed.c and
include/parrot/embed.h will both be deleted eventually.

L<http://trac.parrot.org/parrot/ticket/1910>

=back

=head1 Compiler tools
Expand Down
4 changes: 4 additions & 0 deletions DONORS.pod
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Parrot is Copyright (C) 2001-2008, Parrot Foundation.

=head1 NAME

DONORS

=head1 DONORS

We would like to thank the following people and institutions,
Expand Down
35 changes: 23 additions & 12 deletions MANIFEST
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ config/auto/ipv6.pm []
config/auto/ipv6/test.in []
config/auto/isreg.pm []
config/auto/isreg/test_c.in []
config/auto/jit.pm []
config/auto/libffi.pm []
config/auto/libffi/test_c.in []
config/auto/llvm.pm []
Expand Down Expand Up @@ -247,14 +246,14 @@ config/gen/platform/darwin/sysmem.c []
config/gen/platform/freebsd/uid.c []
config/gen/platform/generic/dl.c []
config/gen/platform/generic/dl.h []
config/gen/platform/generic/encoding.c []
config/gen/platform/generic/env.c []
config/gen/platform/generic/exec.c []
config/gen/platform/generic/hires_timer.c []
config/gen/platform/generic/io.h []
config/gen/platform/generic/itimer.c []
config/gen/platform/generic/math.c []
config/gen/platform/generic/math.h []
config/gen/platform/generic/memexec.c []
config/gen/platform/generic/pid.c []
config/gen/platform/generic/platform_limits.h []
config/gen/platform/generic/signal.c []
Expand All @@ -266,12 +265,12 @@ config/gen/platform/generic/threads.h []
config/gen/platform/generic/time.c []
config/gen/platform/generic/uid.c []
config/gen/platform/ia64/asm.s []
config/gen/platform/linux/encoding.c []
config/gen/platform/netbsd/math.c []
config/gen/platform/netbsd/misc.c []
config/gen/platform/netbsd/misc.h []
config/gen/platform/netbsd/uid.c []
config/gen/platform/openbsd/math.c []
config/gen/platform/openbsd/memexec.c []
config/gen/platform/openbsd/misc.h []
config/gen/platform/openbsd/uid.c []
config/gen/platform/solaris/math.c []
Expand Down Expand Up @@ -373,13 +372,21 @@ docs/dev/pmc_freeze.pod [doc]
docs/dev/pmc_obj_design_meeting_notes.pod [doc]
docs/dev/profiling.pod [doc]
docs/embed.pod [doc]
docs/embed_new.pod [doc]
docs/extend.pod [doc]
docs/faq.pod [doc]
docs/gettingstarted.pod [doc]
docs/glossary.pod [doc]
docs/imcc/README [doc]
docs/imcc/imcfaq.pod [doc]
docs/imcc/operation.pod [doc]
docs/index/developer.json [doc]
docs/index/index.json [doc]
docs/index/ops.json [doc]
docs/index/pct_tutorial.json [doc]
docs/index/pdds.json [doc]
docs/index/pmcs.json [doc]
docs/index/tools.json [doc]
docs/intro.pod [doc]
docs/memory_internals.pod [doc]
docs/multidispatch.pod [doc]
Expand Down Expand Up @@ -682,6 +689,7 @@ examples/pir/local_label.pir [examples]
examples/pir/make_hello_pbc.pir [examples]
examples/pir/mandel.pir [examples]
examples/pir/md5sum.pir [examples]
examples/pir/md5sum_oo.pir [examples]
examples/pir/mysqltest.bas [examples]
examples/pir/perl6.bas [examples]
examples/pir/pirric.pir [examples]
Expand Down Expand Up @@ -1017,6 +1025,7 @@ lib/Parrot/Docs/Group.pm [devel]lib
lib/Parrot/Docs/HTMLPage.pm [devel]lib
lib/Parrot/Docs/Item.pm [devel]lib
lib/Parrot/Docs/POD2HTML.pm [devel]lib
lib/Parrot/Docs/PodToHtml.pm [devel]lib
lib/Parrot/Docs/Section.pm [devel]lib
lib/Parrot/Docs/Section/C.pm [devel]lib
lib/Parrot/Docs/Section/Compilers.pm [devel]lib
Expand Down Expand Up @@ -1299,7 +1308,6 @@ src/io/socket_api.c []
src/io/socket_unix.c []
src/io/socket_win32.c []
src/io/unix.c []
src/io/utf8.c []
src/io/win32.c []
src/key.c []
src/libnci_test.def []
Expand Down Expand Up @@ -1335,10 +1343,8 @@ src/ops/sys.ops []
src/ops/var.ops []
src/packfile/api.c []
src/packfile/byteorder.h []
src/packfile/execute.c []
src/packfile/object_serialization.c []
src/packfile/output.c []
src/packfile/packfile_private.h []
src/packfile/pf_items.c []
src/pbc_disassemble.c []
src/pmc.c []
Expand Down Expand Up @@ -1396,9 +1402,11 @@ src/pmc/orderedhashiterator.pmc []
src/pmc/packfile.pmc []
src/pmc/packfileannotation.pmc []
src/pmc/packfileannotations.pmc []
src/pmc/packfilebytecodesegment.pmc []
src/pmc/packfileconstanttable.pmc []
src/pmc/packfiledebug.pmc []
src/pmc/packfiledirectory.pmc []
src/pmc/packfileopmap.pmc []
src/pmc/packfilerawsegment.pmc []
src/pmc/packfilesegment.pmc []
src/pmc/parrotinterpreter.pmc []
Expand Down Expand Up @@ -1448,9 +1456,9 @@ src/string/encoding/tables.c []
src/string/encoding/tables.h []
src/string/encoding/ucs2.c []
src/string/encoding/ucs4.c []
src/string/encoding/unicode.h []
src/string/encoding/utf16.c []
src/string/encoding/utf8.c []
src/string/unicode.h []
src/sub.c []
src/thread.c []
src/utils.c []
Expand Down Expand Up @@ -1702,6 +1710,7 @@ t/library/pg.t [test]
t/library/protoobject.t [test]
t/library/rand.t [test]
t/library/range.t [test]
t/library/sha.t [test]
t/library/streams.t [test]
t/library/string_utils.t [test]
t/library/tap_parser.t [test]
Expand Down Expand Up @@ -1886,6 +1895,7 @@ t/pmc/multisub.t [test]
t/pmc/namespace-old.t [test]
t/pmc/namespace-subs.t [test]
t/pmc/namespace.t [test]
t/pmc/nativepccmethod.t [test]
t/pmc/nci.t [test]
t/pmc/null.t [test]
t/pmc/object-meths.t [test]
Expand All @@ -1898,8 +1908,10 @@ t/pmc/orderedhashiterator.t [test]
t/pmc/packfile.t [test]
t/pmc/packfileannotation.t [test]
t/pmc/packfileannotations.t [test]
t/pmc/packfilebytecodesegment.t [test]
t/pmc/packfileconstanttable.t [test]
t/pmc/packfiledirectory.t [test]
t/pmc/packfileopmap.t [test]
t/pmc/packfilerawsegment.t [test]
t/pmc/packfilesegment.t [test]
t/pmc/parrotclass.t [test]
Expand Down Expand Up @@ -1953,6 +1965,7 @@ t/src/atomic.t [test]
t/src/basic.t [test]
t/src/checkdepend.t [test]
t/src/embed.t [test]
t/src/embed/api.t [test]
t/src/embed/pmc.t [test]
t/src/embed/strings.t [test]
t/src/exit.t [test]
Expand Down Expand Up @@ -1981,7 +1994,6 @@ t/steps/auto/icu-01.t [test]
t/steps/auto/inline-01.t [test]
t/steps/auto/ipv6-01.t [test]
t/steps/auto/isreg-01.t [test]
t/steps/auto/jit-01.t [test]
t/steps/auto/libffi-01.t [test]
t/steps/auto/llvm-01.t [test]
t/steps/auto/memalign-01.t [test]
Expand Down Expand Up @@ -2055,8 +2067,6 @@ t/tools/dump_pbc.t [test]
t/tools/install/01-create_directories.t [test]
t/tools/install/02-install_files.t [test]
t/tools/install/03-lines_to_files.t [test]
t/tools/install/dev_overall.t [test]
t/tools/install/overall.t [test]
t/tools/install/testlib/LICENSE [test]
t/tools/install/testlib/MANIFEST.1defective [test]
t/tools/install/testlib/README []doc
Expand Down Expand Up @@ -2118,6 +2128,8 @@ tools/dev/dump_pbc.pl []
tools/dev/faces.pl []
tools/dev/fetch_languages.pl []
tools/dev/findhacks.pl []
tools/dev/gdb-pp-load.py []
tools/dev/gdb-pp.py []
tools/dev/gen_charset_tables.pl []
tools/dev/gen_class.pl []
tools/dev/gen_makefile.pl [devel]
Expand All @@ -2128,7 +2140,6 @@ tools/dev/install_dev_files.pl []
tools/dev/install_doc_files.pl []
tools/dev/install_files.pl []
tools/dev/lib_deps.pl []
tools/dev/list_unjitted.pl []
tools/dev/make_cover.pl []
tools/dev/manicheck.pl []
tools/dev/mk_author_map.pl []
Expand Down Expand Up @@ -2170,9 +2181,9 @@ tools/dev/vgp_darwin []
tools/dev/vms-patch []
tools/dev/vtablize.pl []
tools/docs/filename_and_chapter.pl []
tools/docs/make_html_docs.pl []
tools/docs/mk_chm.pl []
tools/docs/ops_summary.pl []
tools/docs/write_docs.pl []
tools/install/smoke.pl []
tools/install/smoke_languages.pl []
tools/release/README []doc
Expand Down
4 changes: 4 additions & 0 deletions MANIFEST.generated
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,13 @@ include/pmc/pmc_orderedhashiterator.h [devel]include
include/pmc/pmc_packfile.h [devel]include
include/pmc/pmc_packfileannotation.h [devel]include
include/pmc/pmc_packfileannotations.h [devel]include
include/pmc/pmc_packfilebytecodesegment.h [devel]include
include/pmc/pmc_packfileconstanttable.h [devel]include
include/pmc/pmc_packfiledebug.h [devel]include
include/pmc/pmc_packfiledirectory.h [devel]include
include/pmc/pmc_packfilefixupentry.h [devel]include
include/pmc/pmc_packfilefixuptable.h [devel]include
include/pmc/pmc_packfileopmap.h [devel]include
include/pmc/pmc_packfilerawsegment.h [devel]include
include/pmc/pmc_packfilesegment.h [devel]include
include/pmc/pmc_parrotinterpreter.h [devel]include
Expand Down Expand Up @@ -390,11 +392,13 @@ src/pmc/orderedhashiterator.dump [devel]src
src/pmc/packfile.dump [devel]src
src/pmc/packfileannotation.dump [devel]src
src/pmc/packfileannotations.dump [devel]src
src/pmc/packfilebytecodesegment.dump [devel]src
src/pmc/packfileconstanttable.dump [devel]src
src/pmc/packfiledebug.dump [devel]src
src/pmc/packfiledirectory.dump [devel]src
src/pmc/packfilefixupentry.dump [devel]src
src/pmc/packfilefixuptable.dump [devel]src
src/pmc/packfileopmap.dump [devel]src
src/pmc/packfilerawsegment.dump [devel]src
src/pmc/packfilesegment.dump [devel]src
src/pmc/parrotinterpreter.dump [devel]src
Expand Down
1 change: 1 addition & 0 deletions PBC_COMPAT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

# please insert tab separated entries at the top of the list

9.4 2011.1.2 plobsing track :main subs in packfiles
9.3 2010.11.24 NotFound move op find_codepoint out of experimental TT #1629
9.2 2010.11.21 plobsing remove CodeString PMC
9.1 2010.10.27 nwellnhof remove charset ops
Expand Down
1 change: 1 addition & 0 deletions compilers/imcc/imc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,7 @@ typedef struct _imc_info_t {
int compiler_state; /* see PBC_* flags */
int verbose;
int write_pbc;
int seen_main;
opcode_t npc;
} imc_info_t;

Expand Down
6 changes: 3 additions & 3 deletions compilers/imcc/imcc.l
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1070,8 +1070,8 @@ define_macro(PARROT_INTERP, ARGIN(const char *name), ARGIN(const params_t *param
m = mem_gc_allocate_zeroed_typed(interp, macro_t);

if (!IMCC_INFO(interp)->macros)
IMCC_INFO(interp)->macros = parrot_new_cstring_hash(interp);
parrot_hash_put(interp, IMCC_INFO(interp)->macros,
IMCC_INFO(interp)->macros = Parrot_hash_new_cstring_hash(interp);
Parrot_hash_put(interp, IMCC_INFO(interp)->macros,
PARROT_const_cast(char *, name), m);
}

Expand All @@ -1090,7 +1090,7 @@ find_macro(PARROT_INTERP, const char *name)
if (!IMCC_INFO(interp)->macros)
return NULL;

return (macro_t *)parrot_hash_get(interp, IMCC_INFO(interp)->macros, name);
return (macro_t *)Parrot_hash_get(interp, IMCC_INFO(interp)->macros, name);
}

static int
Expand Down
Loading

0 comments on commit f90b118

Please sign in to comment.