Permalink
Browse files

Merge branch 'master' into nwellnhof/unicode_filenames

Conflicts:
	compilers/imcc/imc.h
	compilers/imcc/imclexer.c
	compilers/imcc/imcparser.c
	compilers/imcc/imcparser.h
	compilers/imcc/main.c
	compilers/imcc/parser_util.c
	compilers/imcc/pbc.c
	frontend/parrot/main.c
	include/parrot/api.h
	include/parrot/imcc.h
	include/parrot/interpreter.h
	include/parrot/packfile.h
	src/embed/api.c
	src/packfile/api.c
  • Loading branch information...
2 parents ff62b37 + a0d48ce commit adc07e53ad5e2a70e6bf094cdb7f4a3d2c1c5257 @nwellnhof nwellnhof committed Jan 18, 2011
Showing with 6,018 additions and 5,535 deletions.
  1. +2 −0 .gitignore
  2. +13 −6 CREDITS
  3. +6 −2 ChangeLog
  4. +17 −0 DEPRECATED.pod
  5. +1 −2 MANIFEST
  6. +4 −0 MANIFEST.SKIP
  7. +2 −2 MANIFEST.generated
  8. +37 −5 NEWS
  9. +1 −4 PBC_COMPAT
  10. +1 −1 PLATFORMS
  11. +1 −1 README
  12. +1 −1 VERSION
  13. +2 −1 compilers/imcc/Rules.in
  14. +0 −3 compilers/imcc/debug.c
  15. +108 −109 compilers/imcc/imc.h
  16. +0 −2 compilers/imcc/imcparser.c
  17. +0 −2 compilers/imcc/imcparser.h
  18. +528 −132 compilers/imcc/main.c
  19. +0 −515 compilers/imcc/parser_util.c
  20. +155 −102 compilers/imcc/pbc.c
  21. +2 −0 docs/parrothist.pod
  22. 0 docs/pdds/{draft → }/pdd10_embedding.pod
  23. +4 −5 docs/project/release_manager_guide.pod
  24. +84 −48 frontend/parrot/main.c
  25. +2 −1 frontend/pbc_dump/main.c
  26. +12 −1 frontend/pbc_merge/main.c
  27. +18 −12 include/parrot/api.h
  28. +9 −0 include/parrot/exceptions.h
  29. +3 −2 include/parrot/imageio.h
  30. +0 −18 include/parrot/imcc.h
  31. +0 −2 include/parrot/interpreter.h
  32. +3 −3 include/parrot/oplib/core_ops.h
  33. +1,009 −1,009 include/parrot/oplib/ops.h
  34. +1,009 −1,009 include/parrot/opsenum.h
  35. +65 −13 include/parrot/packfile.h
  36. +14 −20 include/parrot/pmc_freeze.h
  37. +1 −0 lib/Parrot/Harness/DefaultTests.pm
  38. +1 −0 lib/Parrot/Install.pm
  39. +8 −0 runtime/parrot/library/Test/More.pir
  40. +3 −18 src/embed.c
  41. +81 −42 src/embed/api.c
  42. +73 −5 src/exceptions.c
  43. +1 −0 src/interp/inter_create.c
  44. +2 −0 src/nci/libffi.c
  45. +2,123 −2,125 src/ops/core_ops.c
  46. +119 −58 src/packfile/api.c
  47. +7 −84 src/packfile/object_serialization.c
  48. +79 −4 src/packfile/output.c
  49. +3 −1 src/pbc_disassemble.c
  50. +28 −0 src/pmc/exception.pmc
  51. +6 −2 src/pmc/float.pmc
  52. +69 −39 src/pmc/imageiofreeze.pmc
  53. +74 −30 src/pmc/imageiosize.pmc
  54. +7 −15 src/pmc/imageiostrings.pmc
  55. +70 −40 src/pmc/imageiothaw.pmc
  56. +49 −1 t/compilers/imcc/syn/errors.t
  57. +10 −6 t/dynoplibs/trans.t
  58. +1 −1 t/manifest/01-basic.t
  59. BIN t/native_pbc/integer.pbc
  60. BIN t/native_pbc/integer_1.pbc
  61. BIN t/native_pbc/number.pbc
  62. BIN t/native_pbc/number_1.pbc
  63. BIN t/native_pbc/string.pbc
  64. BIN t/native_pbc/string_1.pbc
  65. +2 −1 t/pmc/class.t
  66. +16 −1 t/pmc/string.t
  67. +10 −10 t/src/embed.t
  68. +51 −9 t/src/embed/api.t
  69. +4 −3 t/src/embed/strings.t
  70. +7 −7 tools/release/release.json
View
@@ -37,6 +37,7 @@
/blib
/config_lib.pir
/cover_db
+/generated_hello.pbc
/install_config.fpmc
/installable*
/libparrot.def
@@ -443,6 +444,7 @@
/t/src/*_*
/t/src/*.gcov
/t/src/*.gcdada
+/t/src/embed/*.c
/t/stress/*.out
/t/stress/*.pasm
/t/stress/*.pbc
View
@@ -57,7 +57,7 @@ U: heimdall
E: Nattfodd@gmail.com
N: Allison Randal
-D: Architect (0.4.6...) & Lead Developer
+D: Architect (0.4.6 - 2.8.0) & Lead Developer
E: allison@parrot.org
U: allison
@@ -224,8 +224,8 @@ U: creiss
E: creiss@cc.gatech.edu
N: Chip Salzenberg
-D: Release manager emeritus (0.4.6-0.4.7)
-D: Architect emeritus (0.1.2-0.4.5)
+D: Release manager emeritus (0.4.6 - 0.4.7)
+D: Architect emeritus (0.1.2 - 0.4.5)
U: chip
E: chip@pobox.com
@@ -243,12 +243,11 @@ D: Rakudo patches
N: Christoph Otto
U: cotto
-D: Patch for key flags in pdd08
+D: Architect (2.9.0 - current)
D: Range check in Env PMC
A: christoph_googleacct@mksig.org
A: christop...@mksig.org
A: Christoph Otto
-D: Pipp, Lorito taskmaster
E: christoph@mksig.org
N: chromatic
@@ -299,9 +298,13 @@ N: Damian Miles Knopp
U: dmknopp
E: dmknopp@loyola.edu
+N: Daniel Kang
+U: jumpyshoes
+D: improve pbc_disassemble's test coverage
+
N: Dan Sugalski
U: dan
-D: Architect emeritus (0.0.1-0.1.1)
+D: Architect emeritus (0.0.1 - 0.1.1)
E: dan@sidhe.org
W: http://www.sidhe.org/~dan/blog/
@@ -679,6 +682,10 @@ U: LylePerl
D: Win32 and CGI testing
W: http://perl.bristolbath.org/blog/lyle/
+N: Mariano Wahlmann
+E: dichoso@gmail.com
+A: bluescreen
+
N: Marcelo Serra Castilhos
E: mhelix@terra.com.br
D: Bug fix
View
@@ -1,8 +1,12 @@
#1 $Id$
+2011.01.18 cotto
+ * Released 3.0.0
+ See NEWS for more.
+
2010.12.21 Whiteknight
- * Released 2.11.0
- See NEWS for more.
+ * Released 2.11.0
+ See NEWS for more.
2010.11.16 tcurtis
* Released 2.10.0
View
@@ -141,6 +141,23 @@ to work on this type.
L<http://trac.parrot.org/parrot/ticket/1904>
+=item The Eval PMC [eligible in 3.1]
+
+The Eval PMC will be removed. Uses of it returned from compilers will be
+replaced with PackFile PMCs instead.
+
+L<http://trac.parrot.org/parrot/ticket/1969>
+
+=item The PIR and PASM compreg PMCs [eligible in 3.1]
+
+The PMC returned by C<compreg "PIR"> is not going to be an NCI PMC any longer,
+it will be a new type of PMC which conforms to PDD31 and will be similar to
+HLLCompiler.
+
+There will not be a PASM compreg anymore.
+
+L<http://trac.parrot.org/parrot/ticket/1967>
+
=back
=head1 Opcodes
View
@@ -399,7 +399,6 @@ docs/pdds/draft/pdd01_overview.pod [doc]
docs/pdds/draft/pdd05_opfunc.pod [doc]
docs/pdds/draft/pdd06_pasm.pod [doc]
docs/pdds/draft/pdd08_keys.pod [doc]
-docs/pdds/draft/pdd10_embedding.pod [doc]
docs/pdds/draft/pdd11_extending.pod [doc]
docs/pdds/draft/pdd14_numbers.pod [doc]
docs/pdds/draft/pdd16_native_call.pod [doc]
@@ -409,6 +408,7 @@ docs/pdds/pdd00_pdd.pod [doc]
docs/pdds/pdd03_calling_conventions.pod [doc]
docs/pdds/pdd07_codingstd.pod [doc]
docs/pdds/pdd09_gc.pod [doc]
+docs/pdds/pdd10_embedding.pod [doc]
docs/pdds/pdd13_bytecode.pod [doc]
docs/pdds/pdd15_object_metamodel.png [doc]
docs/pdds/pdd15_object_metamodel.svg [doc]
@@ -952,7 +952,6 @@ include/parrot/global_setup.h [main]include
include/parrot/hash.h [main]include
include/parrot/hll.h [main]include
include/parrot/imageio.h [main]include
-include/parrot/imcc.h [main]include
include/parrot/interpreter.h [main]include
include/parrot/io.h [main]include
include/parrot/io_portable.h [main]include
View
@@ -350,6 +350,8 @@
^/frontend/pbc_merge/.*\.gcov/
^/frontend/pbc_merge/main\.o$
^/frontend/pbc_merge/main\.o/
+^/generated_hello\.pbc$
+^/generated_hello\.pbc/
^/include/parrot/.*\.tmp$
^/include/parrot/.*\.tmp/
^/include/parrot/config\.h$
@@ -980,6 +982,8 @@
^/t/src/.*\.gcov/
^/t/src/.*_.*$
^/t/src/.*_.*/
+^/t/src/embed/.*\.c$
+^/t/src/embed/.*\.c/
^/t/stress/.*\.out$
^/t/stress/.*\.out/
^/t/stress/.*\.pasm$
View
@@ -1,11 +1,11 @@
# See tools/dev/install_files.pl for documentation on the
# format of this file.
# Please re-sort this file after *EVERY* modification
-blib/lib/libparrot.2.11.0.dylib [main]lib
+blib/lib/libparrot.3.0.0.dylib [main]lib
blib/lib/libparrot.a [main]lib
blib/lib/libparrot.dylib [main]lib
blib/lib/libparrot.so [main]lib
-blib/lib/libparrot.so.2.11.0 [main]lib
+blib/lib/libparrot.so.3.0.0 [main]lib
compilers/data_json/data_json.pbc [data_json]
config/gen/call_list/opengl.in []
docs/ops/bit.pod [doc]
View
@@ -1,10 +1,42 @@
New in 3.0.0
- Core
- + Added a new embedding API in "parrot/api.h"
- + Removed autovivification behavior from ResizablePMCArray
- + Packfile manipulation functions now throw exceptions on error instead of printing error details directly to stderr
- + Test coverage for several PMC types has been significantly increased
- + Test coverage for several internal subsystems has been increased
+ + A new embedding API is available in "parrot/api.h" and documented in
+ docs/pdd/pdd10_embedding.pod .
+ + Packfile PMCs were refactored and can now be used to produce runnable bytecode.
+ + Packfile manipulation code now throws embedder-friendly exceptions rather
+ than printing error details directly to stderr.
+ + Unicode support for file IO, environment variables, program names, and
+ command-line parameters was improved.
+ + An experimental gdb pretty-printers in tools/dev for Parrot STRINGs and
+ PMCs is now available. (gdb 7.2 or later and Python are required)
+ + c2str.pl and pmc2c.pl improvements result in a noticably faster build.
+ + Bugs in our Digest::sha256 library and bit-related dynamic ops were fixed
+ by GCI student Nolan Lum. Both now work correctly on 32 and 64 bit systems.
+- Languages
+ + Ωη;)XD - OMeta for Winxed https://github.com/plobsing/ohm-eta-wink-kzd
+- Community
+ + tree-optimization by GSoC student Tyler L. Curtis joined the nest and now
+ lives at http://github.com/parrot/tree-optimization .
+ + Plumage now lives at http://github.com/parrot/plumage and is installable.
+ + Christmas proceeded as scheduled. The Parrot team does not take credit for
+ this event.
+- Documentation
+ + HTML documentation generation has been rewritten and greatly simplified.
+ + We have improved documentation in docs/project/git_workflow.pod about
+ keeping a fork of parrot.git in sync.
+ + Translations of our README in various languages are now in the
+ docs/translation directory, thanks to Google Code-In students.
+- Tests
+ + A better way to write "todo" tests with Parrot's Test::More was implemented
+ by GCI student Fernando Brito.
+ + Major increases in test coverage of many core PMCs, dynamic PMCs and
+ dynamic opcodes resulted from GCI and the interpid students it attracted.
+ + Jonathan "Duke" Leto set up Debian Linux x86_64 and sparc32 smokers
+ in the GCC Compile Farm, which continually submit smoke reports with
+ a variety of configuration options and compilers. Thanks, GCC!
+ + Makefile dependency checking is now automatically tested, resulting in a
+ more reliable parallel build.
+ + Coverage tests were improved for platforms with and without Devel::Cover.
New in 2.11.0
- Core
View
@@ -28,10 +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
+10.0 2011.01.18 cotto released 3.0.0
9.0 2010.10.19 gerd released 2.9.0
8.0 2010.07.20 coke released 2.6.0
7.0 2010.04.20 gerd released 2.3.0 (version # added ex post facto, as all previous version #s were published)
View
@@ -12,6 +12,7 @@ Supported platforms:
Platform B8 Runloops Feature Comp Test Inst YYYYMMDD
CGoto EXEC Thr Sig
--------------------------------------------------------------------------------
+linux-sparc64-gcc-4.3.2 ? Y Y 20110114
cygwin1.5.25-x86-gcc3.4.4 4 Y - - - Y Y Y 20090315
darwin8.11.1-x86-gcc4.0.1 ?? Y ? ? ? Y Y N 20091020
linux-x86-gcc4.1.2 Y ? Y Y Y Y ? 20090419
@@ -83,7 +84,6 @@ B ... Processor is big endian
4 ... opcode_t is 4 byte, --m=32 on a 64 bit machine
CGoto ... CGoto runloop is supported
-JIT ... JIT core is supported
EXEC ... compiling to native executables is supported
Thr ... Parrot is multi-threaded
Sig ... Parrot catches a SIGHUP signal
View
@@ -1,4 +1,4 @@
-This is Parrot, version 2.11.0
+This is Parrot, version 3.0.0
------------------------------
Parrot is Copyright (C) 2001-2011, Parrot Foundation.
View
@@ -1 +1 @@
-2.11.0
+3.0.0
@@ -148,17 +148,18 @@ compilers/imcc/main$(O) : \
compilers/imcc/imc.h \
compilers/imcc/imcparser.h \
compilers/imcc/instructions.h \
+ compilers/imcc/optimizer.h \
compilers/imcc/parser.h \
compilers/imcc/pbc.h \
compilers/imcc/sets.h \
compilers/imcc/symreg.h \
compilers/imcc/unit.h \
$(INC_DIR)/embed.h \
- $(INC_DIR)/imcc.h \
$(INC_DIR)/oplib/ops.h \
$(INC_DIR)/runcore_api.h \
$(INC_DIR)/api.h \
$(INC_DIR)/longopt.h \
+ include/pmc/pmc_sub.h \
$(PARROT_H_HEADERS)
## SUFFIX OVERRIDE - Warnings (This is generated code)
@@ -115,9 +115,6 @@ IMCC_warning(PARROT_INTERP, ARGIN(const char *fmt), ...)
{
ASSERT_ARGS(IMCC_warning)
va_list ap;
- if (IMCC_INFO(interp)->imcc_warn)
- return;
-
va_start(ap, fmt);
imcc_vfprintf(interp, Parrot_io_STDERR(interp), fmt, ap);
va_end(ap);
Oops, something went wrong. Retry.

0 comments on commit adc07e5

Please sign in to comment.