Skip to content

Commit

Permalink
merge latest changes from trunk.
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.parrot.org/parrot/branches/rm_cflags@44632 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information
coke committed Mar 4, 2010
1 parent 19e2cd1 commit 21bfff8
Show file tree
Hide file tree
Showing 26 changed files with 1,276 additions and 3,971 deletions.
4 changes: 0 additions & 4 deletions MANIFEST
View file
Expand Up @@ -1018,7 +1018,6 @@ include/parrot/dynext.h [main]include
include/parrot/embed.h [main]include
include/parrot/encoding.h [main]include
include/parrot/enums.h [main]include
include/parrot/events.h [main]include
include/parrot/exceptions.h [main]include
include/parrot/exit.h [main]include
include/parrot/extend.h [main]include
Expand Down Expand Up @@ -1063,7 +1062,6 @@ include/parrot/sub.h [main]include
include/parrot/thr_pthread.h [main]include
include/parrot/thr_windows.h [main]include
include/parrot/thread.h [main]include
include/parrot/tsq.h [main]include
include/parrot/vtables.h [main]include
include/parrot/warnings.h [main]include
include/pmc/dummy [main]include
Expand Down Expand Up @@ -1324,7 +1322,6 @@ src/dynpmc/rational.pmc [devel]src
src/dynpmc/rotest.pmc [devel]src
src/dynpmc/subproxy.pmc [devel]src
src/embed.c []
src/events.c []
src/exceptions.c []
src/exit.c []
src/extend.c []
Expand Down Expand Up @@ -1516,7 +1513,6 @@ src/string/primitives.c []
src/string/unicode.h []
src/sub.c []
src/thread.c []
src/tsq.c []
src/utils.c []
src/vtable.tbl [devel]src
src/vtables.c []
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.SKIP
View file
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
# generated by tools/dev/mk_manifest_and_skip.pl Thu Feb 25 23:56:41 2010 UT
# generated by tools/dev/mk_manifest_and_skip.pl Thu Mar 4 20:45:33 2010 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
Expand Down
1 change: 1 addition & 0 deletions PBC_COMPAT
View file
Expand Up @@ -27,6 +27,7 @@

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

6.4 2010.03.02 cotto remove prederef__ and reserved
6.3 2010.02.16 whiteknight Add OpLib and Opcode PMCs
6.2 2010.01.31 cotto serialization-related changes to ParrotInterpreter
6.1 2010.01.30 whiteknight remove Array PMC
Expand Down
2 changes: 1 addition & 1 deletion compilers/imcc/parser_util.c
View file
Expand Up @@ -548,7 +548,7 @@ INS(PARROT_INTERP, ARGMOD(IMC_Unit *unit), ARGIN(const char *name),
}
}

if (op_info->jump && op_info->jump != PARROT_JUMP_ENEXT) {
if (op_info->jump) {
ins->type |= ITBRANCH;
/* TODO use opnum constants */
if (STREQ(name, "branch")
Expand Down
15 changes: 0 additions & 15 deletions config/gen/makefiles/root.in
View file
Expand Up @@ -192,7 +192,6 @@ GEN_PASM_INCLUDES = \
runtime/parrot/include/datatypes.pasm \
runtime/parrot/include/iterator.pasm \
runtime/parrot/include/call_bits.pasm \
runtime/parrot/include/io_thr_msg.pasm \
runtime/parrot/include/timer.pasm \
runtime/parrot/include/except_types.pasm \
runtime/parrot/include/except_severity.pasm \
Expand Down Expand Up @@ -376,7 +375,6 @@ PARROT_H_HEADERS = \
$(INC_DIR)/io.h \
$(INC_DIR)/op.h \
$(INC_DIR)/pmc.h \
$(INC_DIR)/events.h \
$(INC_DIR)/gc_api.h \
$(INC_DIR)/string_funcs.h \
$(INC_DIR)/misc.h \
Expand All @@ -387,7 +385,6 @@ PARROT_H_HEADERS = \
$(INC_DIR)/nci.h \
$(INC_DIR)/thread.h \
$(INC_DIR)/scheduler.h \
$(INC_DIR)/tsq.h \
$(INC_DIR)/longopt.h \
$(INC_DIR)/oo.h \
$(INC_DIR)/vtables.h \
Expand Down Expand Up @@ -449,7 +446,6 @@ INTERP_O_FILES = \
src/dynext$(O) \
src/embed$(O) \
src/string/encoding$(O) \
src/events$(O) \
src/exceptions$(O) \
src/exit$(O) \
src/extend$(O) \
Expand Down Expand Up @@ -497,7 +493,6 @@ INTERP_O_FILES = \
src/sub$(O) \
src/thread$(O) \
src/runcore/trace$(O) \
src/tsq$(O) \
src/utils$(O) \
src/vtables$(O) \
src/warnings$(O) \
Expand Down Expand Up @@ -644,7 +639,6 @@ $(GEN_LIBRARY) : $(PARROT) $(GEN_PASM_INCLUDES)
STR_FILES = \
src/debug.str \
src/dynext.str \
src/events.str \
src/exceptions.str \
src/global.str \
src/global_setup.str \
Expand Down Expand Up @@ -1082,9 +1076,6 @@ runtime/parrot/include/stdio.pasm : $(INC_DIR)/io.h $(H2INC)
runtime/parrot/include/socket.pasm : $(INC_DIR)/io.h $(H2INC)
$(PERL) $(H2INC) $(INC_DIR)/io.h $@

runtime/parrot/include/io_thr_msg.pasm : $(INC_DIR)/events.h $(H2INC)
$(PERL) $(H2INC) $(INC_DIR)/events.h $@

runtime/parrot/include/hash_key_type.pasm : $(INC_DIR)/hash.h $(H2INC)
$(PERL) $(H2INC) $(INC_DIR)/hash.h $@

Expand Down Expand Up @@ -1258,8 +1249,6 @@ src/exceptions$(O) : $(PARROT_H_HEADERS) \
src/exceptions.str \
include/pmc/pmc_continuation.h

src/events$(O) : $(PARROT_H_HEADERS) src/events.str

src/thread$(O) : $(PARROT_H_HEADERS) $(INC_DIR)/atomic.h \
include/pmc/pmc_sub.h \
include/pmc/pmc_parrotinterpreter.h
Expand Down Expand Up @@ -1382,10 +1371,6 @@ src/runcore/cores$(O) : src/runcore/cores.str \
$(INC_DIR)/runcore_api.h $(INC_DIR)/runcore_trace.h \
$(PARROT_H_HEADERS)

## SUFFIX OVERRIDE
src/tsq$(O) : $(PARROT_H_HEADERS) src/tsq.c
$(CC) $(CFLAGS) @optimize::src/tsq.c@ @ccwarn::src/tsq.c@ @cc_shared@ -I$(@D) @cc_o_out@ $@ -c src/tsq.c

src/embed$(O) : $(PARROT_H_HEADERS) $(INC_DIR)/embed.h \
$(INC_DIR)/oplib/ops.h $(INC_DIR)/runcore_api.h \
compilers/imcc/imc.h \
Expand Down
226 changes: 0 additions & 226 deletions include/parrot/events.h
View file

This file was deleted.

9 changes: 1 addition & 8 deletions include/parrot/op.h
View file
Expand Up @@ -51,13 +51,7 @@ typedef enum {

/* See lib/Parrot/OpsFile.pm if the names of these values change */
typedef enum {
PARROT_JUMP_RELATIVE = 1,
PARROT_JUMP_ADDRESS = 2,
PARROT_JUMP_POP = 4,
PARROT_JUMP_ENEXT = 8,
PARROT_JUMP_GNEXT = 16,
PARROT_JUMP_UNPREDICTABLE = 32,
PARROT_JUMP_RESTART = 64
PARROT_JUMP_RELATIVE = 1
} op_jump_t;

/* NOTE: Sure wish we could put the types here... */
Expand All @@ -82,7 +76,6 @@ typedef struct op_info_t {
arg_type_t types[PARROT_MAX_ARGS]; /* arg_type_t, 0 = 1st arg */
arg_dir_t dirs[PARROT_MAX_ARGS]; /* arg_dir_t 0 = 1st arg */
char labels[PARROT_MAX_ARGS]; /* 0/1 0 = 1st arg */
unsigned int flags;
} op_info_t;


Expand Down

0 comments on commit 21bfff8

Please sign in to comment.