Permalink
Browse files

Merge branch 'm0' of github.com:parrot/parrot into m0

  • Loading branch information...
Jimmy Zhuo
Jimmy Zhuo committed Jun 26, 2012
2 parents 55bed69 + 3618e52 commit b4f577d0d63001d5b2f5d047633301c8aa1d0c0d
Showing with 81 additions and 1 deletion.
  1. +68 −0 MANIFEST
  2. +12 −0 MANIFEST.SKIP
  3. +1 −1 docs/pdds/draft/pdd32_m0.pod
View
@@ -354,6 +354,7 @@ docs/pdds/draft/pdd14_numbers.pod [doc]
docs/pdds/draft/pdd16_native_call.pod [doc]
docs/pdds/draft/pdd29_compiler_tools.pod [doc]
docs/pdds/draft/pdd31_hll.pod [doc]
+docs/pdds/draft/pdd32_m0.pod [doc]
docs/pdds/pdd00_pdd.pod [doc]
docs/pdds/pdd03_calling_conventions.pod [doc]
docs/pdds/pdd07_codingstd.pod [doc]
@@ -1251,6 +1252,17 @@ src/libnci_test.def []
src/library.c []
src/list.c []
src/longopt.c []
+src/m0/adding_ops.pod []
+src/m0/c/Makefile []
+src/m0/c/ROADMAP []
+src/m0/c/interp.c []
+src/m0/c/m0.h []
+src/m0/c/mob.c []
+src/m0/c/ops.c []
+src/m0/c/tags.mk []
+src/m0/m0.ops []
+src/m0/perl5/m0_assembler.pl []
+src/m0/perl5/m0_interp.pl []
src/misc.c []
src/multidispatch.c []
src/namespace.c []
@@ -1722,6 +1734,61 @@ t/library/uri_escape.t [test]
t/library/uuid.t [test]
t/library/yaml_dumper.t [test]
t/library/yaml_tiny.t [test]
+t/m0/basic/hello.m0 [test]
+t/m0/basic/hello2.m0 [test]
+t/m0/basic/hello_canon.m0b [test]
+t/m0/integration/m0_add_i.m0 [test]
+t/m0/integration/m0_add_n.m0 [test]
+t/m0/integration/m0_alias.m0 [test]
+t/m0/integration/m0_and.m0 [test]
+t/m0/integration/m0_args.m0 [test]
+t/m0/integration/m0_ashr.m0 [test]
+t/m0/integration/m0_chunk_name_const.m0 [test]
+t/m0/integration/m0_convert_i_n.m0 [test]
+t/m0/integration/m0_deref.m0 [test]
+t/m0/integration/m0_div_i.m0 [test]
+t/m0/integration/m0_div_n.m0 [test]
+t/m0/integration/m0_goto_chunk.m0 [test]
+t/m0/integration/m0_hash.m0 [test]
+t/m0/integration/m0_labels_with_goto.m0 [test]
+t/m0/integration/m0_labels_without_goto.m0 [test]
+t/m0/integration/m0_lshr.m0 [test]
+t/m0/integration/m0_metadata_basic.m0 [test]
+t/m0/integration/m0_mod_i.m0 [test]
+t/m0/integration/m0_mod_n.m0 [test]
+t/m0/integration/m0_mult_i.m0 [test]
+t/m0/integration/m0_mult_n.m0 [test]
+t/m0/integration/m0_noop.m0 [test]
+t/m0/integration/m0_or.m0 [test]
+t/m0/integration/m0_pc_increment.m0 [test]
+t/m0/integration/m0_poke_caller.m0 [test]
+t/m0/integration/m0_set.m0 [test]
+t/m0/integration/m0_set_imm.m0 [test]
+t/m0/integration/m0_set_ref.m0 [test]
+t/m0/integration/m0_shl.m0 [test]
+t/m0/integration/m0_sub_i.m0 [test]
+t/m0/integration/m0_sub_n.m0 [test]
+t/m0/integration/m0_xor.m0 [test]
+t/m0/invalid/hello_early_bytecode_segment.m0 [test]
+t/m0/invalid/hello_multiversion.m0 [test]
+t/m0/invalid/invalid_bytecode.m0 [test]
+t/m0/invalid/invalid_chunk_name.m0 [test]
+t/m0/invalid/invalid_chunk_name2.m0 [test]
+t/m0/invalid/invalid_chunk_names_collide.m0 [test]
+t/m0/invalid/invalid_duplicate_labels.m0 [test]
+t/m0/invalid/invalid_goto.m0 [test]
+t/m0/invalid/invalid_op.m0 [test]
+t/m0/invalid/invalid_register.m0 [test]
+t/m0/invalid/invalid_register_alias.m0 [test]
+t/m0/invalid/invalid_register_name.m0 [test]
+t/m0/invalid/invalid_register_number.m0 [test]
+t/m0/invalid/invalid_register_number2.m0 [test]
+t/m0/invalid/invalid_register_type.m0 [test]
+t/m0/invalid/invalid_version.m0 [test]
+t/m0/m0_assembler.t [test]
+t/m0/m0_bytecode_loading.t [test]
+t/m0/m0_integration.t [test]
+t/m0/m0_run_hello_m0b.t [test]
t/manifest/01-basic.t [test]
t/manifest/02-regenerate_file.t [test]
t/manifest/03-regenerate_skip.t [test]
@@ -2145,6 +2212,7 @@ tools/dev/install_dev_files.pl []
tools/dev/install_doc_files.pl []
tools/dev/install_files.pl []
tools/dev/lib_deps.pl []
+tools/dev/m0_opcheck.pl []
tools/dev/make_cover.pl []
tools/dev/manicheck.pl []
tools/dev/merge_pull_request.pl []
View
@@ -716,6 +716,14 @@
^/src/jit_defs\.c/
^/src/jit_emit\.h$
^/src/jit_emit\.h/
+^/src/m0/c/m0$
+^/src/m0/c/m0/
+^/src/m0/c/m0-debug$
+^/src/m0/c/m0-debug/
+^/src/m0/c/m0-debug\.exe$
+^/src/m0/c/m0-debug\.exe/
+^/src/m0/c/m0\.exe$
+^/src/m0/c/m0\.exe/
^/src/nci/.*\.gcda$
^/src/nci/.*\.gcda/
^/src/nci/.*\.gcno$
@@ -910,6 +918,10 @@
^/t/library/.*\.pir/
^/t/library/.*_pbcexe.*$
^/t/library/.*_pbcexe.*/
+^/t/m0/.*\.m0b$
+^/t/m0/.*\.m0b/
+^/t/m0/integration/.*\.m0b$
+^/t/m0/integration/.*\.m0b/
^/t/native_pbc/.*_pbcexe.*$
^/t/native_pbc/.*_pbcexe.*/
^/t/oo/.*\.pbc$
@@ -1044,7 +1044,7 @@ M0 registers will not have innate types; they'll be nothing more than a
collection of bits which are assumed to have a certain type by M0's ops. The
types that ops attribute to register values will be based on the position of
the register in an M0 call frame's register set. The proposed structure uses the
-first 8 registers for information specific to the call frame and has 60 of each primitive
+first 8 registers for information specific to the call frame and has 61 of each primitive
type:
number type

0 comments on commit b4f577d

Please sign in to comment.