Permalink
Browse files

Merge branch 'master' of git://github.com/nol888/parrot

  • Loading branch information...
Whiteknight committed Dec 13, 2010
2 parents ab8b582 + 6b61c67 commit 532f1ce4695812892db4bf6a68b89173fa3b98ec
View
@@ -901,6 +901,10 @@ ext/nqp-rx/t/p6regex/rx_modifiers [test]
ext/nqp-rx/t/p6regex/rx_quantifiers [test]
ext/nqp-rx/t/p6regex/rx_subrules [test]
ext/nqp-rx/t/p6regex/rx_syntax [test]
+frontend/parrot/main.c []
+frontend/parrot_debugger/main.c []
+frontend/pbc_dump/main.c []
+frontend/pbc_merge/main.c []
include/parrot/atomic.h [main]include
include/parrot/atomic/fallback.h [main]include
include/parrot/atomic/gcc_pcc.h [main]include
@@ -1287,7 +1291,6 @@ src/libnci_test.def []
src/library.c []
src/list.c []
src/longopt.c []
-src/main.c []
src/misc.c []
src/multidispatch.c []
src/namespace.c []
@@ -1316,14 +1319,12 @@ src/ops/string.ops []
src/ops/sys.ops []
src/ops/var.ops []
src/packdump.c []
-src/packfile.c []
+src/packfile/api.c []
src/packfile/byteorder.h []
+src/packfile/object_serialization.c []
+src/packfile/output.c []
src/packfile/pf_items.c []
-src/packout.c []
-src/parrot_debugger.c []
src/pbc_disassemble.c []
-src/pbc_dump.c []
-src/pbc_merge.c []
src/pmc.c []
src/pmc/addrregistry.pmc []
src/pmc/arrayiterator.pmc []
@@ -1411,7 +1412,6 @@ src/pmc/threadinterpreter.pmc []
src/pmc/timer.pmc []
src/pmc/undef.pmc []
src/pmc/unmanagedstruct.pmc []
-src/pmc_freeze.c []
src/pointer_array.c []
src/runcore/cores.c []
src/runcore/main.c []
@@ -2090,6 +2090,7 @@ tools/dev/gen_charset_tables.pl []
tools/dev/gen_class.pl []
tools/dev/gen_makefile.pl [devel]
tools/dev/gen_valgrind_suppressions.pl []
+tools/dev/github_post_receive.pl []
tools/dev/headerizer.pl []
tools/dev/install_dev_files.pl []
tools/dev/install_doc_files.pl []
@@ -39,9 +39,9 @@ doc-prep:
$(MKPATH) ops
$(TOUCH) doc-prep
-packfile-c.pod: ../src/packfile.c
-#IF(new_perldoc): $(PERLDOC_BIN) -ud packfile-c.pod ../src/packfile.c
-#ELSE: $(PERLDOC_BIN) -u ../src/packfile.c > packfile-c.pod
+packfile-c.pod: ../src/packfile/api.c
+#IF(new_perldoc): $(PERLDOC_BIN) -ud packfile-c.pod ../src/packfile/api.c
+#ELSE: $(PERLDOC_BIN) -u ../src/packfile/api.c > packfile-c.pod
clean:
$(RM_F) packfile-c.pod $(POD) doc-prep
@@ -495,10 +495,8 @@ INTERP_O_FILES = \
#IF(has_core_nci_thunks): src/nci/core_thunks$(O) \
#IF(has_extra_nci_thunks): src/nci/extra_thunks$(O) \
src/oo$(O) \
- src/packfile$(O) \
- src/packout$(O) \
src/platform$(O) \
- src/pmc_freeze$(O) \
+ src/packfile/object_serialization$(O) \
src/pmc$(O) \
src/runcore/main$(O) \
src/runcore/cores$(O) \
@@ -513,6 +511,8 @@ INTERP_O_FILES = \
src/utils$(O) \
src/vtables$(O) \
src/warnings$(O) \
+ src/packfile/api$(O) \
+ src/packfile/output$(O) \
src/packfile/pf_items$(O) \
@TEMP_atomic_o@ \
@TEMP_gc_o@ \
@@ -591,7 +591,7 @@ MAKE = @make_c@
.SUFFIXES : .c .S .s .pmc .dump $(O) .str .pir .pbc
.c$(O) : # suffix rule (limited support)
- $(CC) $(CFLAGS) @optimize@ $(CC_WARN) -I$(@D) @cc_o_out@$@ -c $<
+ $(CC) $(CFLAGS) @optimize@ $(CC_WARN) -I$(@D) -Isrc/ @cc_o_out@$@ -c $<
#UNLESS(win32):.s$(O) : # suffix rule (limited support)
#UNLESS(win32): $(CC) $(CFLAGS) @optimize@ $(CC_WARN) -I$(@D) @cc_o_out@$@ -c $<
@@ -700,10 +700,10 @@ STR_FILES = \
#IF(has_core_nci_thunks): src/nci/core_thunks.str \
#IF(has_extra_nci_thunks): src/nci/extra_thunks.str \
src/nci/signatures.str \
- src/packfile.str \
+ src/packfile/api.str \
+ src/packfile/object_serialization.str \
src/packfile/pf_items.str \
src/pmc.str \
- src/pmc_freeze.str \
src/oo.str \
src/runcore/cores.str \
src/runcore/main.str \
@@ -857,11 +857,11 @@ runtime/parrot/include/config.fpmc : myconfig config_lib.pir \
runtime/parrot/include/datatypes.pasm $(MINIPARROT)
$(MINIPARROT) -Iruntime/parrot/include config_lib.pir > $@
-$(PARROT) : src/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
+$(PARROT) : frontend/parrot/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
src/parrot_config$(O) \
$(MINIPARROT)
$(LINK) @ld_out@$@ \
- src/main$(O) src/parrot_config$(O) \
+ frontend/parrot/main$(O) src/parrot_config$(O) \
@rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS) $(LINK_DYNAMIC)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
@@ -885,17 +885,17 @@ $(PARROT_CONFIG) : $(DEV_TOOLS_DIR)/parrot-config.pir $(PARROT) $(PBC_TO_EXE)
$(PARROT) -o parrot_config.pbc $(DEV_TOOLS_DIR)/parrot-config.pir
$(PARROT) pbc_to_exe.pbc parrot_config.pbc
-$(MINIPARROT) : src/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
+$(MINIPARROT) : frontend/parrot/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
src/null_config$(O)
- $(LINK) @ld_out@$@ src/main$(O) src/null_config$(O) \
+ $(LINK) @ld_out@$@ frontend/parrot/main$(O) src/null_config$(O) \
@rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
-$(INSTALLABLEPARROT) : src/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
+$(INSTALLABLEPARROT) : frontend/parrot/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
src/install_config$(O) \
$(PARROT)
$(LINK) @ld_out@$@ \
- src/main$(O) src/install_config$(O) \
+ frontend/parrot/main$(O) src/install_config$(O) \
@rpath_lib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
@@ -1023,20 +1023,20 @@ $(INSTALLABLEPROVE) : parrot-prove.pbc $(PBC_TO_EXE) src/install_config$(O)
# Parrot Debugger
#
-src/parrot_debugger$(O) : $(PARROT_H_HEADERS) src/parrot_debugger.c \
+frontend/parrot_debugger/main$(O) : $(PARROT_H_HEADERS) frontend/parrot_debugger/main.c \
$(INC_DIR)/embed.h \
$(INC_DIR)/runcore_api.h
-$(PDB) : src/parrot_debugger$(O) src/parrot_config$(O) $(LIBPARROT)
+$(PDB) : frontend/parrot_debugger/main$(O) src/parrot_config$(O) $(LIBPARROT)
$(LINK) @ld_out@$@ \
- src/parrot_debugger$(O) \
+ frontend/parrot_debugger/main$(O) \
src/parrot_config$(O) \
@rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
-$(INSTALLABLEPDB) : src/parrot_debugger$(O) $(LIBPARROT) src/parrot_config$(O)
+$(INSTALLABLEPDB) : frontend/parrot_debugger/main$(O) $(LIBPARROT) src/parrot_config$(O)
$(LINK) @ld_out@$@ \
- src/parrot_debugger$(O) \
+ frontend/parrot_debugger/main$(O) \
src/parrot_config$(O) \
@rpath_lib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
@@ -1067,24 +1067,24 @@ $(INSTALLABLEDIS) : src/pbc_disassemble$(O) \
src/packdump$(O) : $(PARROT_H_HEADERS) include/pmc/pmc_sub.h \
include/pmc/pmc_key.h src/packdump.c
-$(PDUMP) : src/pbc_dump$(O) src/packdump$(O) $(LIBPARROT)
+$(PDUMP) : frontend/pbc_dump/main$(O) src/packdump$(O) $(LIBPARROT)
$(LINK) @ld_out@$@ \
- src/pbc_dump$(O) \
+ frontend/pbc_dump/main$(O) \
src/packdump$(O) @rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
-src/pbc_dump$(O) : \
+frontend/pbc_dump/main$(O) : \
$(INC_DIR)/embed.h \
$(INC_DIR)/oplib/ops.h \
$(INC_DIR)/oplib/core_ops.h \
$(PARROT_H_HEADERS) \
$(INC_DIR)/runcore_api.h \
- src/pbc_dump.c
+ frontend/pbc_dump/main.c
-$(INSTALLABLEPDUMP) : src/pbc_dump$(O) src/packdump$(O) \
+$(INSTALLABLEPDUMP) : frontend/pbc_dump/main$(O) src/packdump$(O) \
src/install_config$(O) $(LIBPARROT)
$(LINK) @ld_out@$@ \
- src/pbc_dump$(O) \
+ frontend/pbc_dump/main$(O) \
src/packdump$(O) \
@rpath_lib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
@@ -1095,16 +1095,16 @@ $(INSTALLABLEPDUMP) : src/pbc_dump$(O) src/packdump$(O) \
# Parrot Bytecode File Merger
#
-$(PBC_MERGE) : src/pbc_merge$(O) $(LIBPARROT) src/parrot_config$(O)
+$(PBC_MERGE) : frontend/pbc_merge/main$(O) $(LIBPARROT) src/parrot_config$(O)
$(LINK) @ld_out@$@ \
- src/pbc_merge$(O) \
+ frontend/pbc_merge/main$(O) \
src/parrot_config$(O) \
@rpath_blib@ $(ALL_PARROT_LIBS) $(LINK_DYNAMIC) $(LINKFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
-$(INSTALLABLEPBC_MERGE) : src/pbc_merge$(O) $(LIBPARROT) $(INSTALLABLECONFIG)
+$(INSTALLABLEPBC_MERGE) : frontend/pbc_merge/main$(O) $(LIBPARROT) $(INSTALLABLECONFIG)
$(LINK) @ld_out@$@ \
- src/pbc_merge$(O) \
+ frontend/pbc_merge/main$(O) \
src/install_config$(O) \
@rpath_lib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
@@ -1295,7 +1295,7 @@ src/namespace$(O) : $(PARROT_H_HEADERS) src/namespace.str src/namespace.c \
src/pmc$(O) : include/pmc/pmc_class.h src/pmc.c \
src/pmc.str $(PARROT_H_HEADERS)
-src/pmc_freeze$(O) : $(PARROT_H_HEADERS) src/pmc_freeze.str src/pmc_freeze.c
+src/packfile/object_serialization$(O) : $(PARROT_H_HEADERS) src/packfile/object_serialization.str src/packfile/object_serialization.c
src/hash$(O) : $(PARROT_H_HEADERS) src/hash.c
@@ -1537,13 +1537,13 @@ src/io/win32$(O) : $(PARROT_H_HEADERS) src/io/io_private.h \
src/gc/alloc_memory$(O) : $(PARROT_H_HEADERS) src/gc/alloc_memory.c
-src/main$(O) : \
+frontend/parrot/main$(O) : \
$(INC_DIR)/imcc.h \
$(PARROT_H_HEADERS) \
$(INC_DIR)/embed.h \
$(INC_DIR)/runcore_api.h \
src/gc/gc_private.h \
- src/main.c \
+ frontend/parrot/main.c \
src/gc/variable_size_pool.h
src/multidispatch$(O) : \
@@ -1555,9 +1555,9 @@ src/multidispatch$(O) : \
include/pmc/pmc_nci.h \
include/pmc/pmc_sub.h
-src/packfile$(O) : \
- src/packfile.str \
- src/packfile.c \
+src/packfile/api$(O) : \
+ src/packfile/api.str \
+ src/packfile/api.c \
include/pmc/pmc_sub.h \
include/pmc/pmc_key.h \
include/pmc/pmc_parrotlibrary.h \
@@ -1577,14 +1577,14 @@ src/packfile$(O) : \
$(PARROT_H_HEADERS) \
$(INC_DIR)/runcore_api.h
+src/packfile/output$(O) : $(PARROT_H_HEADERS) include/pmc/pmc_key.h src/packfile/output.c
+
src/packfile/pf_items$(O) : \
$(PARROT_H_HEADERS) \
src/packfile/byteorder.h \
src/packfile/pf_items.str \
src/packfile/pf_items.c
-src/packout$(O) : $(PARROT_H_HEADERS) include/pmc/pmc_key.h src/packout.c
-
src/parrot$(O) : $(GENERAL_H_FILES)
src/runcore/cores$(O) : src/runcore/cores.str \
@@ -1707,9 +1707,9 @@ src/string/encoding/ucs4$(O) : $(PARROT_H_HEADERS) \
src/string/encoding/shared.h \
src/string/unicode.h
-src/pbc_merge$(O) : \
+frontend/pbc_merge/main$(O) : \
$(INC_DIR)/embed.h \
- src/pbc_merge.c \
+ frontend/pbc_merge/main.c \
include/pmc/pmc_sub.h \
$(INC_DIR)/oplib/ops.h \
$(INC_DIR)/oplib/core_ops.h \
@@ -2062,12 +2062,12 @@ prog-clean :
parrot-prove.pbc parrot-prove.c parrot-prove$(O) parrot-prove$(EXE) \
parrot_config$(EXE) parrot_config.c parrot_config$(O) parrot_config.pbc \
compilers/imcc/main$(O) \
- $(PDUMP) src/pbc_dump$(O) src/packdump$(O) \
- $(PDB) src/parrot_debugger$(O) \
- $(PBC_MERGE) src/pbc_merge$(O) \
+ $(PDUMP) frontend/pbc_dump/main$(O) src/packdump$(O) \
+ $(PDB) frontend/parrot_debugger/main$(O) \
+ $(PBC_MERGE) frontend/pbc_merge/main$(O) \
$(DIS) src/pbc_disassemble$(O)
$(RM_F) \
- src/main$(O) \
+ frontend/parrot/main$(O) \
src/null_config$(O) \
src/parrot_config$(O) \
src/install_config$(O) \
@@ -2100,9 +2100,9 @@ archclean: dynext-clean
$(INSTALLABLECONFIG) \
$(INSTALLABLENQP) \
compilers/imcc/main$(O) \
- $(PDUMP) src/pbc_dump$(O) src/packdump$(O) \
- $(PDB) src/parrot_debugger$(O) \
- $(PBC_MERGE) src/pbc_merge$(O) \
+ $(PDUMP) frontend/pbc_dump/main$(O) src/packdump$(O) \
+ $(PDB) frontend/parrot_debugger/main$(O) \
+ $(PBC_MERGE) frontend/pbc_merge/main$(O) \
$(DIS) src/pbc_disassemble$(O) \
$(PARROT_CONFIG) parrot_config$(O) parrot_config.c \
src/parrot_config$(O) parrot_config.pbc \
@@ -2216,7 +2216,7 @@ status :
patch :
git diff
-LINTABLE_CFILES = `echo src/main$(O) $(O_FILES) src/parrot_config$(O) | $(PERL) -pe @PQ@s/\.o/\.c/g@PQ@`
+LINTABLE_CFILES = `echo frontend/parrot/main$(O) $(O_FILES) src/parrot_config$(O) | $(PERL) -pe @PQ@s/\.o/\.c/g@PQ@`
lint : sunlint
@@ -2728,9 +2728,9 @@ cagecritic:
HEADERIZER_O_FILES = \
$(O_FILES) \
- src/main$(O) \
+ frontend/parrot/main$(O) \
src/packdump$(O) \
- src/pbc_merge$(O) \
+ frontend/pbc_merge/main$(O) \
headerizer : src/core_pmcs.c
$(HEADERIZER) $(HEADERIZER_O_FILES) compilers/imcc/imcc.y
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -30,7 +30,7 @@ about the structure of the frozen bytecode.
#include "parrot/dynext.h"
#include "parrot/runcore_api.h"
#include "../compilers/imcc/imc.h"
-#include "packfile.str"
+#include "api.str"
#include "pmc/pmc_sub.h"
#include "pmc/pmc_key.h"
#include "pmc/pmc_callcontext.h"
@@ -23,7 +23,7 @@ individual action vtable (freeze/thaw) is then called for all todo-PMCs.
#include "parrot/parrot.h"
#include "pmc/pmc_callcontext.h"
-#include "pmc_freeze.str"
+#include "object_serialization.str"
/* when thawing a string longer then this size, we first do a GC run and then
* block GC - the system can't give us more headers */
File renamed without changes.
Oops, something went wrong.

0 comments on commit 532f1ce

Please sign in to comment.