Permalink
Browse files

Merge branch 'master' into opsc_llvm

Conflicts:
	config/auto/llvm.pm
	t/steps/auto/llvm-01.t
  • Loading branch information...
2 parents 3ba281e + d83b2f4 commit 04933aa260330b4039d09112a34bba8230656f56 @bacek bacek committed Apr 25, 2011
Showing with 7,672 additions and 9,781 deletions.
  1. +0 −4 .gitignore
  2. +1 −1 CREDITS
  3. +4 −0 ChangeLog
  4. +10 −1 Configure.pl
  5. +5 −6 MANIFEST
  6. +0 −8 MANIFEST.SKIP
  7. +4 −2 MANIFEST.generated
  8. +15 −1 NEWS
  9. +1 −1 PLATFORMS
  10. +1 −1 README
  11. +1 −1 VERSION
  12. +68 −61 api.yaml
  13. +2 −1 compilers/imcc/Defines.mak
  14. +46 −0 compilers/imcc/Rules.in
  15. +210 −0 compilers/imcc/api.c
  16. +148 −124 compilers/imcc/cfg.c
  17. +21 −22 compilers/imcc/cfg.h
  18. +94 −32 compilers/imcc/debug.c
  19. +41 −21 compilers/imcc/debug.h
  20. +49 −48 compilers/imcc/imc.c
  21. +118 −177 compilers/imcc/imc.h
  22. +353 −298 compilers/imcc/imcc.l
  23. +554 −528 compilers/imcc/imcc.y
  24. +521 −457 compilers/imcc/imclexer.c
  25. +1,176 −1,156 compilers/imcc/imcparser.c
  26. +8 −7 compilers/imcc/imcparser.h
  27. +31 −157 compilers/imcc/instructions.c
  28. +22 −27 compilers/imcc/instructions.h
  29. +361 −863 compilers/imcc/main.c
  30. +197 −177 compilers/imcc/optimizer.c
  31. +17 −10 compilers/imcc/optimizer.h
  32. +13 −16 compilers/imcc/parser.h
  33. +80 −72 compilers/imcc/parser_util.c
  34. +522 −473 compilers/imcc/pbc.c
  35. +47 −27 compilers/imcc/pbc.h
  36. +113 −260 compilers/imcc/pcc.c
  37. +96 −81 compilers/imcc/reg_alloc.c
  38. +17 −16 compilers/imcc/sets.c
  39. +24 −15 compilers/imcc/sets.h
  40. +186 −174 compilers/imcc/symreg.c
  41. +125 −73 compilers/imcc/symreg.h
  42. +0 −12 compilers/pct/src/PAST/Compiler.pir
  43. +2 −6 config/auto/gc.pm
  44. +13 −5 config/auto/llvm.pm
  45. +2 −0 config/auto/pmc.pm
  46. +1 −0 config/auto/warnings.pm
  47. +0 −3 config/gen/config_h/config_h.in
  48. +20 −39 config/gen/makefiles/root.in
  49. +2 −2 docs/book/pir/ch03_basic_syntax.pod
  50. +1 −1 docs/book/pir/ch04_variables.pod
  51. +9 −6 docs/book/pir/ch09_exceptions.pod
  52. +10 −8 docs/compiler_faq.pod
  53. +6 −6 docs/imcc/operation.pod
  54. +1 −0 docs/index/developer.json
  55. +1 −0 docs/parrothist.pod
  56. +6 −6 docs/pdds/pdd19_pir.pod
  57. +11 −11 docs/pdds/pdd20_lexical_vars.pod
  58. +4 −4 docs/pdds/pdd22_io.pod
  59. +33 −1 docs/project/hacking_tips.pod
  60. +18 −5 docs/project/release_manager_guide.pod
  61. +176 −176 docs/translations/README.BGR
  62. +160 −27 frontend/parrot/main.c
  63. +4 −5 frontend/parrot_debugger/main.c
  64. +8 −5 frontend/pbc_dump/main.c
  65. +64 −0 include/imcc/api.h
  66. +135 −0 include/imcc/embed.h
  67. +21 −0 include/imcc/yyscanner.h
  68. +17 −27 include/parrot/api.h
  69. +6 −2 include/parrot/compiler.h
  70. +4 −6 include/parrot/context.h
  71. +2 −0 include/parrot/core_types.h
  72. +1 −1 include/parrot/debugger.h
  73. +0 −8 include/parrot/exit.h
  74. +2 −1 include/parrot/gc_api.h
  75. +2 −3 include/parrot/global_setup.h
  76. +11 −14 include/parrot/hll.h
  77. +20 −37 include/parrot/interpreter.h
  78. +9 −13 include/parrot/io.h
  79. +0 −20 include/parrot/misc.h
  80. +1 −1 include/parrot/oplib/core_ops.h
  81. +41 −45 include/parrot/packfile.h
  82. +8 −4 include/parrot/string.h
  83. +1 −0 lib/Parrot/Configure/Options/Conf/Shared.pm
  84. +1 −1 lib/Parrot/Pmc2c/Emitter.pm
  85. +1 −2 lib/Parrot/Pmc2c/Method.pm
  86. +3 −103 lib/Parrot/Test.pm
  87. +19 −6 lib/Parrot/Vtable.pm
  88. +2 −2 runtime/parrot/library/Archive/Tar.pir
  89. +2 −2 runtime/parrot/library/Archive/Zip.pir
  90. +2 −2 runtime/parrot/library/HTTP/Message.pir
  91. +2 −2 runtime/parrot/library/LWP/Protocol.pir
  92. +3 −3 runtime/parrot/library/LWP/UserAgent.pir
  93. +13 −13 runtime/parrot/library/NCI/Utils.pir
  94. +0 −2 runtime/parrot/library/PGE/Dumper.pir
  95. +1 −1 runtime/parrot/library/Stream/Sub.pir
  96. +2 −2 runtime/parrot/library/Stream/Writer.pir
  97. +3 −3 runtime/parrot/library/TAP/Harness.pir
  98. +2 −2 runtime/parrot/library/TAP/Parser.pir
  99. +6 −5 src/call/context_accessors.c
  100. +5 −5 src/debug.c
  101. +2 −3 src/dynoplibs/io.ops
  102. +2 −2 src/dynoplibs/trans.ops
  103. +33 −14 src/embed.c
  104. +64 −50 src/embed/api.c
  105. +21 −0 src/embed/pmc.c
  106. +2 −0 src/exceptions.c
  107. +0 −23 src/exit.c
  108. +3 −0 src/gc/api.c
  109. +17 −8 src/gc/gc_gms.c
  110. +51 −27 src/gc/mark_sweep.c
  111. +1 −1 src/gc/string_gc.c
  112. +3 −3 src/global_setup.c
  113. +15 −12 src/hll.c
  114. +5 −17 src/interp/inter_create.c
  115. +55 −8 src/interp/inter_misc.c
  116. +7 −7 src/io/api.c
  117. +3 −3 src/io/buffer.c
  118. +3 −5 src/io/filehandle.c
  119. +2 −2 src/multidispatch.c
  120. +8 −8 src/nci/core_thunks.c
  121. +1 −1 src/nci/core_thunks.nci
  122. +7 −7 src/ops/core.ops
  123. +105 −895 src/ops/core_ops.c
  124. +38 −85 src/ops/experimental.ops
  125. +1 −1 src/ops/math.ops
  126. +1 −2 src/ops/object.ops
  127. +2 −2 src/ops/set.ops
  128. +6 −5 src/ops/var.ops
  129. +206 −126 src/packfile/api.c
  130. +2 −3 src/packfile/output.c
  131. +1 −8 src/pmc.c
  132. +2 −1 src/pmc/boolean.pmc
  133. +5 −1 src/pmc/eval.pmc
  134. +18 −0 src/pmc/fixedfloatarray.pmc
  135. +6 −8 src/pmc/hashiterator.pmc
  136. +2 −2 src/pmc/imageiofreeze.pmc
  137. +7 −23 src/pmc/imageiosize.pmc
  138. +285 −0 src/pmc/imccompiler.pmc
  139. +1 −0 src/pmc/iterator.pmc
  140. +1 −1 src/pmc/opcode.pmc
  141. +1 −1 src/pmc/packfileopmap.pmc
  142. +2 −0 src/pmc/ptr.pmc
  143. +6 −6 src/pmc/ptrobj.pmc
  144. +1 −2 src/pmc/stringbuilder.pmc
  145. +3 −3 src/pmc/unmanagedstruct.pmc
  146. +0 −7 src/runcore/cores.c
  147. +18 −23 src/spf_render.c
  148. +1 −11 src/string/api.c
  149. +0 −251 src/utils.c
  150. +1 −2 t/TESTS_STATUS.pod
  151. +0 −60 t/compilers/imcc/imcpasm/cfg.t
  152. +0 −74 t/compilers/imcc/imcpasm/opt0.t
  153. +0 −1,211 t/compilers/imcc/imcpasm/opt1.t
  154. +0 −156 t/compilers/imcc/imcpasm/opt2.t
  155. +0 −411 t/compilers/imcc/imcpasm/optc.t
  156. +0 −26 t/compilers/imcc/imcpasm/pcc.t
  157. +2 −0 t/dynpmc/os.t
  158. +1 −9 t/op/spawnw.t
  159. +1 −41 t/perl/Parrot_Test.t
  160. +1 −1 t/pmc/pmc.t
  161. +10 −10 t/src/embed.t
  162. +9 −4 t/src/embed/api.t
  163. +16 −16 t/src/extend.t
  164. +296 −3 t/src/extend_vtable.t
  165. +30 −5 t/steps/auto/llvm-01.t
  166. +6 −5 tools/build/vtable_extend.pl
  167. +5 −4 tools/build/vtable_h.pl
  168. +48 −2 tools/dev/pbc_to_exe.pir
  169. +11 −1 tools/install/smoke_languages.pl
  170. +7 −7 tools/release/release.json
View
@@ -388,10 +388,6 @@
/t/compilers/data_json/*.pir
/t/compilers/data_json/*_pbcexe
/t/compilers/imcc/*.pbc
-/t/compilers/imcc/imcpasm/*.pasm
-/t/compilers/imcc/imcpasm/*.pbc
-/t/compilers/imcc/imcpasm/*.pir
-/t/compilers/imcc/imcpasm/*_pbcexe
/t/compilers/imcc/reg/*.pasm
/t/compilers/imcc/reg/*.pbc
/t/compilers/imcc/reg/*.pir
View
@@ -100,7 +100,7 @@ E: yDNA@cpan.org
N: Andrew Whitworth
D: Internals development
D: Documentation
-D: Release manager for 0.8.2, 1.3.0, 1.5.0, 2.4.0 and 2.11.0
+D: Release manager for 0.8.2, 1.3.0, 1.5.0, 2.4.0, 2.11.0 and 3.3.0
E: wknight8111@gmail.com
U: Whiteknight
View
@@ -1,5 +1,9 @@
#1
+2011.04.19 Whiteknight
+ * Released 3.3.0
+ See NEWS for more.
+
2011.03.15 Gerd
* Released 3.2.0
See NEWS for more.
View
@@ -266,7 +266,11 @@ =head2 Compile Options
=item C<--cc=(compiler)>
-Specify which compiler to use.
+Specify which C compiler to use.
+
+=item C<--cxx=(compiler)>
+
+Specify which C++ compiler to use.
=item C<--ccflags=(flags)>
@@ -403,6 +407,11 @@ =head2 Other Options
Use this option if you want imcc's parser and lexer files to be generated.
Needs a working parser and lexer.
+=item C<--with-llvm>
+
+Use this option if you have a recent version of LLVM installed and wish Parrot
+to link to it.
+
=back
=head1 CONFIGURATION-FILE INTERFACE
View
@@ -35,6 +35,7 @@ compilers/data_json/data_json/grammar.pg [data_json]
compilers/data_json/data_json/pge2pir.tg [data_json]
compilers/imcc/Defines.mak [imcc]
compilers/imcc/Rules.in [imcc]
+compilers/imcc/api.c [imcc]
compilers/imcc/cfg.c [imcc]
compilers/imcc/cfg.h [imcc]
compilers/imcc/debug.c [imcc]
@@ -867,6 +868,9 @@ frontend/parrot_debugger/main.c []
frontend/pbc_dump/main.c []
frontend/pbc_dump/packdump.c []
frontend/pbc_merge/main.c []
+include/imcc/api.h [main]include
+include/imcc/embed.h [main]include
+include/imcc/yyscanner.h [main]include
include/parrot/api.h [main]include
include/parrot/atomic.h [main]include
include/parrot/atomic/fallback.h [main]include
@@ -1367,6 +1371,7 @@ src/pmc/imageiofreeze.pmc []
src/pmc/imageiosize.pmc []
src/pmc/imageiostrings.pmc []
src/pmc/imageiothaw.pmc []
+src/pmc/imccompiler.pmc []
src/pmc/integer.pmc []
src/pmc/iterator.pmc []
src/pmc/key.pmc []
@@ -1492,12 +1497,6 @@ t/codingstd/tabs.t [test]
t/codingstd/trailing_space.t [test]
t/compilers/data_json/from_parrot.t [test]
t/compilers/data_json/to_parrot.t [test]
-t/compilers/imcc/imcpasm/cfg.t [test]
-t/compilers/imcc/imcpasm/opt0.t [test]
-t/compilers/imcc/imcpasm/opt1.t [test]
-t/compilers/imcc/imcpasm/opt2.t [test]
-t/compilers/imcc/imcpasm/optc.t [test]
-t/compilers/imcc/imcpasm/pcc.t [test]
t/compilers/imcc/reg/alloc.t [test]
t/compilers/imcc/reg/spill.t [test]
t/compilers/imcc/reg/spill_old.t [test]
View
@@ -870,14 +870,6 @@
^/t/compilers/data_json/.*_pbcexe/
^/t/compilers/imcc/.*\.pbc$
^/t/compilers/imcc/.*\.pbc/
-^/t/compilers/imcc/imcpasm/.*\.pasm$
-^/t/compilers/imcc/imcpasm/.*\.pasm/
-^/t/compilers/imcc/imcpasm/.*\.pbc$
-^/t/compilers/imcc/imcpasm/.*\.pbc/
-^/t/compilers/imcc/imcpasm/.*\.pir$
-^/t/compilers/imcc/imcpasm/.*\.pir/
-^/t/compilers/imcc/imcpasm/.*_pbcexe$
-^/t/compilers/imcc/imcpasm/.*_pbcexe/
^/t/compilers/imcc/reg/.*\.pasm$
^/t/compilers/imcc/reg/.*\.pasm/
^/t/compilers/imcc/reg/.*\.pbc$
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.3.2.0.dylib [main]lib
+blib/lib/libparrot.3.3.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.3.2.0 [main]lib
+blib/lib/libparrot.so.3.3.0 [main]lib
compilers/data_json/data_json.pbc [data_json]
config/gen/call_list/opengl.in []
docs/ops/bit.pod [doc]
@@ -70,6 +70,7 @@ include/pmc/pmc_imageiofreeze.h [devel]include
include/pmc/pmc_imageiosize.h [devel]include
include/pmc/pmc_imageiostrings.h [devel]include
include/pmc/pmc_imageiothaw.h [devel]include
+include/pmc/pmc_imccompiler.h [devel]include
include/pmc/pmc_integer.h [devel]include
include/pmc/pmc_iterator.h [devel]include
include/pmc/pmc_key.h [devel]include
@@ -387,6 +388,7 @@ src/pmc/imageiofreeze.dump [devel]src
src/pmc/imageiosize.dump [devel]src
src/pmc/imageiostrings.dump [devel]src
src/pmc/imageiothaw.dump [devel]src
+src/pmc/imccompiler.dump [devel]src
src/pmc/integer.dump [devel]src
src/pmc/iterator.dump [devel]src
src/pmc/key.dump [devel]src
View
16 NEWS
@@ -1,6 +1,20 @@
+New in 3.4.0
+- Core
+ + The Generational Mark and Sweep garbage collector is the new default.
+
New in 3.3.0
- Core
- + The isa and isa_pmc vtables can be overridden from PIR
+ + The isa and isa_pmc vtables can now be overridden from PIR
+ + IMCC has a new improved external interface
+ + A new IMCCompiler PMC adds prototype PDD31-alike functionality for the PIR and PASM compilers
+ + New --with-llvm option to Configure.pl, which will link to LLVM if it is available
+- Community
+ + Parrot Virtual Machine was accepted into Google Summer of Code 2011
+- Ecosystem
+ + Rosella adds a stable "Event" library to implement a publish/subscribe mechanism
+- Tests
+ + The test coverage of the extend_vtable subsystem was greatly increased
+
New in 3.2.0
- Core
View
@@ -54,7 +54,7 @@ netbsd4.0-arm-gcc-4.1.2 Y ? Y Y Y Y ? 20090518
netbsd4.0-i386-gcc-4.1.2 Y ? Y Y Y Y ? 20090517
netbsd4.0-ppc-gcc-4.1.2 B Y ? Y Y Y Y ? 20090519
netbsd4.0-sparc64-gcc-4.1.2 B8 Y - Y Y Y Y ? 20090519
-netbsd4.0-x86_64-gcc-4.1.2 8 Y ? Y Y Y Y ? 20090519
+netbsd4.0-x86_64-gcc-4.1.2 8 Y ? Y Y Y Y ? 20110418
netbsd5.0-i386-gcc-4.1.3 Y ? Y Y Y Y ? 20090519
netbsd5.0-ppc-gcc-4.1.3 B Y ? Y Y Y Y ? 20090517
netbsd5.0-mipseb32-gcc-4.1.3 B Y ? Y Y Y Y ? 20090518
View
2 README
@@ -1,4 +1,4 @@
-This is Parrot, version 3.2.0
+This is Parrot, version 3.3.0
------------------------------
Parrot is Copyright (C) 2001-2011, Parrot Foundation.
View
@@ -1 +1 @@
-3.2.0
+3.3.0
Oops, something went wrong.

0 comments on commit 04933aa

Please sign in to comment.