/hg/release/icedtea6-1.6: 4 new changesets
cpdev-commits at icedtea.classpath.org
cpdev-commits at icedtea.classpath.org
Fri Aug 21 05:45:22 PDT 2009
changeset 234dd693b3ec in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=234dd693b3ec
summary: 2009-08-18 Edward Nevill <ed at camswl.com>
changeset caf6aebb73ca in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=caf6aebb73ca
summary: 2009-08-20 Gary Benson <gbenson at redhat.com>
changeset a98ad2958053 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=a98ad2958053
summary: Adjust Shark to LLVM 2.6svn rev 79521.
changeset 3bb4b0a830b3 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=3bb4b0a830b3
summary: 2009-08-21 Matthias Klose <doko at ubuntu.com>
diffstat:
17 files changed, 14570 insertions(+), 13 deletions(-)
.hgignore | 1
ChangeLog | 86
Makefile.am | 27
mkbc.c | 581 +
patches/icedtea-notice-safepoints.patch | 16
ports/hotspot/build/linux/makefiles/zero.make | 9
ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 7863 ++++++++++++++
ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp | 29
ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp | 24
ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 5820 ++++++++++
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 14
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 10
ports/hotspot/src/share/vm/shark/llvmValue.hpp | 4
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 12
ports/hotspot/src/share/vm/shark/sharkFunction.hpp | 4
ports/hotspot/src/share/vm/shark/sharkType.cpp | 46
ports/hotspot/src/share/vm/shark/sharkType.hpp | 37
diffs (truncated from 14852 to 500 lines):
diff -r bd60280483e5 -r 3bb4b0a830b3 .hgignore
--- a/.hgignore Thu Aug 13 15:48:51 2009 +0100
+++ b/.hgignore Fri Aug 21 09:55:52 2009 +0200
@@ -469,3 +469,4 @@ pulseaudio/.*jar
pulseaudio/.*jar
pulse-java.jar
hotspot.tar.gz
+ports/hotspot/src/cpu/zero/vm/bytecodes_arm.s
diff -r bd60280483e5 -r 3bb4b0a830b3 ChangeLog
--- a/ChangeLog Thu Aug 13 15:48:51 2009 +0100
+++ b/ChangeLog Fri Aug 21 09:55:52 2009 +0200
@@ -1,3 +1,89 @@ 2009-08-07 Matthias Klose <doko at ubuntu
+2009-08-21 Matthias Klose <doko at ubuntu.com>
+
+ * Makefile.am (stamps/hotspot-tools-class-files.stamp,
+ stamps/rt-class-files.stamp): Set classpath to '' (eclipse #285466).
+
+2009-08-20 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ Adjust Shark to LLVM 2.6svn rev 79521.
+
+ * ports/hotspot/src/share/vm/shark/llvmValue.hpp
+ (LLVMValue::jfloat_constant): Push LLVMContexts through the
+ llvm::Type APIs to handle LLVM 2.6svn API change.
+ (LLVMValue::jdouble_constant): Likewise.
+ (LLVMValue::bit_constant): Likewise.
+
+ * ports/hotspot/src/share/vm/shark/sharkType.cpp
+ (SharkType::initialize): Likewise.
+
+ * ports/hotspot/src/share/vm/shark/sharkType.hpp
+ (SharkType::intptr_type): Likewise.
+ (SharkType::jboolean_type): Likewise.
+ (SharkType::jbyte_type): Likewise.
+ (SharkType::jchar_type): Likewise.
+ (SharkType::jshort_type): Likewise.
+ (SharkType::jint_type): Likewise.
+ (SharkType::jlong_type): Likewise.
+ (SharkType::jfloat_type): Likewise.
+ (SharkType::jdouble_type): Likewise.
+
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+ (SharkBuilder::make_type): Likewise.
+ (SharkBuilder::CreateBlock): Push LLVMContexts through the
+ BasicBlock::Create APIs to handle LLVM 2.6svn API change.
+
+ * ports/hotspot/src/share/vm/shark/sharkFunction.hpp
+ (SharkFunction::CreateBlock): Likewise.
+
+2009-08-20 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/cpu/zero/vm/bc.def: Renamed to...
+ * ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def: New file.
+
+ * Makefile.am: Build bytecodes_arm.s from bytecodes_arm.def.
+
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Include
+ bytecodes_arm.s rather than bytecodes.s.
+
+ * ports/hotspot/src/cpu/zero/vm/bytecodes.s: Removed.
+
+ * .hgignore: Updated.
+
+2009-08-18 Edward Nevill <ed at camswl.com>
+
+ Added ARM assembler interpreter
+
+ * openjdk/hotspot/src/share/vm/interpreter.hpp
+ Allow ARM interpreter to notice safepoints
+ Changed via patches/icedtea-notice-safepoints.patch
+
+ * ports/hotspot/build/linux/makefiles/zero.make
+ Add cppInterpreter_arm
+ Add CFLAGS for ARM asm interpreter
+ Add rules to build .o from .S
+
+ * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp
+ Add initialisation of new bytecodes for asm interpreter
+
+ * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp
+ Add definitions of new bytecodes for asm interpreter
+
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+ Add hooks to call asm interpreter
+
+ * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+ Add hooks to allow HW null pointer detection
+
+ [ NEW FILES ]
+ * ports/hotspot/src/cpu/zero/vm/bc.def
+ Bytecode templates
+ * ports/hotspot/src/cpu/zero/vm/bytecodes.s
+ Bytecode implementations (manually generated from bc.def)
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_asm.S
+ Complex bytecode implementations, entry points and support code
+ * ports/hotspot/src/cpu/zero/vm/mkbc.c
+ Bytecode generator, use to generate bytecodes.s from bc.def
+
2009-08-07 Matthias Klose <doko at ubuntu.com>
* Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Add configure options
diff -r bd60280483e5 -r 3bb4b0a830b3 Makefile.am
--- a/Makefile.am Thu Aug 13 15:48:51 2009 +0100
+++ b/Makefile.am Fri Aug 21 09:55:52 2009 +0200
@@ -457,6 +457,17 @@ if WITH_VISUALVM
rm -f $(NETBEANS_PROFILER_SRC_ZIP)
endif
+# Build asm interpreter bytecodes
+ZERO_ASM_BC_DEF = $(abs_top_srcdir)/ports/hotspot/src/cpu/zero/vm/bytecodes_$(ZERO_LIBARCH).def
+ZERO_ASM_BC_ASM = $(abs_top_srcdir)/ports/hotspot/src/cpu/zero/vm/bytecodes_$(ZERO_LIBARCH).s
+ZERO_ASM_BC_ASM_COND = $(shell test -f ${ZERO_ASM_BC_DEF} && echo ${ZERO_ASM_BC_ASM})
+
+$(abs_top_srcdir)/mkbc: $(abs_top_srcdir)/mkbc.c
+ $(CC) $< -o $@
+
+${ZERO_ASM_BC_ASM}: ${ZERO_ASM_BC_DEF} $(abs_top_srcdir)/mkbc
+ $(abs_top_srcdir)/mkbc $< $@
+
# Link ports sources into tree
stamps/ports.stamp: stamps/replace-hotspot.stamp
for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
@@ -503,6 +514,7 @@ ICEDTEA_FSG_PATCHES =
ICEDTEA_FSG_PATCHES =
ICEDTEA_PATCHES = \
+ patches/icedtea-notice-safepoints.patch \
patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \
patches/icedtea-signature-iterator.patch \
patches/icedtea-test-atomic-operations.patch \
@@ -1121,7 +1133,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \
extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
- stamps/pulse-java.stamp
+ stamps/pulse-java.stamp $(ZERO_ASM_BC_ASM_COND)
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk \
@@ -1206,7 +1218,7 @@ stamps/icedtea-debug.stamp: stamps/boots
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \
extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
- stamps/pulse-java.stamp
+ stamps/pulse-java.stamp $(ZERO_ASM_BC_ASM_COND)
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk \
@@ -1318,7 +1330,8 @@ stamps/native-ecj.stamp:
stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
- stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp
+ stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp \
+ $(ZERO_ASM_BC_ASM_COND)
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_ECJ) \
-C openjdk-ecj/ \
@@ -1477,14 +1490,14 @@ stamps/hotspot-tools-class-files.stamp:
-source 1.5 \
-sourcepath \
'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
- -bootclasspath \'\' @$< ; \
+ -classpath \'\' -bootclasspath \'\' @$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
-d lib/hotspot-tools \
-source 1.5 \
-sourcepath \
'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
- -bootclasspath \'\' @$< ; \
+ -classpath \'\' -bootclasspath \'\' @$< ; \
fi
mkdir -p stamps
touch stamps/hotspot-tools-class-files.stamp
@@ -1529,13 +1542,13 @@ stamps/rt-class-files.stamp: rt-source-f
-source 1.5 \
-sourcepath \
'$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
- -bootclasspath \'\' @$< ; \
+ -classpath \'\' -bootclasspath \'\' @$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
-source 1.5 \
-sourcepath \
'$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
- -bootclasspath \'\' @$< ; \
+ -classpath \'\' -bootclasspath \'\' @$< ; \
fi
cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
lib/rt/net/sourceforge/jnlp/
diff -r bd60280483e5 -r 3bb4b0a830b3 mkbc.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mkbc.c Fri Aug 21 09:55:52 2009 +0200
@@ -0,0 +1,581 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#define DEFAULT_PREFIX "do_"
+
+static char *prefix = DEFAULT_PREFIX;
+
+#define ISALPHA(c) (isalpha(c) || (c) == '_')
+#define ISALNUM(c) (isalnum(c) || (c) == '_')
+
+FILE *source_f, *bci_f, *bci_f;
+
+typedef struct Bytecode {
+ char *name;
+ int len;
+} Bytecode;
+
+typedef struct StringList {
+ struct StringList *next;
+ char *line;
+} StringList;
+
+typedef struct OpcodeList {
+ struct OpcodeList *next;
+ long opcode;
+} OpcodeList;
+
+typedef struct OpcodeSequence {
+ struct OpcodeSequence *next;
+ OpcodeList *opcode_list;
+} OpcodeSequence;
+
+typedef struct BytecodeImpl {
+ struct BytecodeImpl *next;
+ OpcodeSequence *opcode_seq;
+ StringList *macro_impl;
+ StringList *direct_impl;
+ int len;
+ char *name;
+ char *do_name;
+} BytecodeImpl;
+
+Bytecode bytecodes[256];
+
+BytecodeImpl *the_impl = 0;
+BytecodeImpl **the_impl_ptr = &the_impl;
+
+#define BUFLEN 1024
+
+static int lineno = 1;
+
+void fatal(const char *s)
+{
+ fputs(s, stderr);
+ fputc('\n', stderr);
+ exit(1);
+}
+
+void outmem(void)
+{
+ fprintf(stderr, "Out of memory\n");
+ exit(1);
+}
+
+void synerr(void)
+{
+ fprintf(stderr, "Syntax error at line %d\n", lineno);
+ exit(1);
+}
+
+int readchar()
+{
+ int c;
+
+ c = getc(source_f);
+ if (c == '\n') lineno++;
+ return c;
+}
+
+int readwhitespace(int c, char *buf, int len)
+{
+ int i = 0;
+
+ while ((isspace)(c)) {
+ if (buf && i < len-1) buf[i++] = c;
+ c = (readchar)();
+ }
+ if (buf && i < len) buf[i] = 0;
+ return c;
+}
+
+int skipwhitespace(int c)
+{
+ while ((isspace)(c)) {
+ c = (readchar)();
+ }
+ return c;
+}
+
+int readeol(int c, char *buf, int len)
+{
+ int i = 0;
+
+ while (c != '\n' && c != EOF) {
+ if (buf && i < len-1) buf[i++] = c;
+ c = (readchar)();
+ }
+ if (buf && i < len) buf[i] = 0;
+ if (c == '\n') c = (readchar)();
+ return c;
+}
+
+int skipeol(int c)
+{
+ while (c != '\n' && c != EOF) c = (readchar)();
+ if (c == '\n') c = (readchar)();
+ return c;
+}
+
+int readsymbol(int c, char *buf, int len)
+{
+ int i = 0;
+
+ while (ISALNUM(c)) {
+ if (buf && i < len-1) buf[i++] = c;
+ c = (readchar)();
+ }
+ if (buf && i < len) buf[i] = 0;
+ return c;
+}
+
+int bcdef(int c, char *buf, int len)
+{
+ BytecodeImpl *def;
+ OpcodeSequence *seq;
+ OpcodeSequence **seqp;
+ OpcodeList *opc;
+ OpcodeList **opcp;
+ StringList *macro, **macrop;
+ StringList *direct, **directp;
+ char *name;
+ char *line;
+ int i;
+ int length, overall_len;
+
+ def = malloc(sizeof(BytecodeImpl));
+ if (!def) outmem();
+ def->next = 0;
+ def->opcode_seq = 0;
+ def->macro_impl = 0;
+ def->direct_impl = 0;
+ def->len = -1;
+ *the_impl_ptr = def;
+ the_impl_ptr = &(def->next);
+ seqp = &(def->opcode_seq);
+ overall_len = 0;
+ do {
+ seq = malloc(sizeof(OpcodeSequence));
+ if (!seq) outmem();
+ seq->next = 0;
+ seq->opcode_list = 0;
+ *seqp = seq;
+ seqp = &(seq->next);
+ opcp = &(seq->opcode_list);
+ length = -2;
+ do {
+ c = (readchar)();
+ c = skipwhitespace(c);
+ if (!ISALPHA(c)) synerr();
+ c = readsymbol(c, buf, len);
+ c = skipwhitespace(c);
+ opc = malloc(sizeof(OpcodeList));
+ if (!opc) outmem();
+ opc->next = 0;
+ opc->opcode = -1;
+ *opcp = opc;
+ opcp = &(opc->next);
+ name = strdup(buf);
+ if (!name) outmem();
+ for (i = 0; i < 256; i++) {
+ if (strcmp(name, bytecodes[i].name) == 0) {
+ opc->opcode = i;
+ break;
+ }
+ }
+ if (i == 256) {
+ fprintf(stderr, "No such opcode '%s'\n", name);
+ exit(1);
+ }
+ if (length == -2) length = bytecodes[i].len;
+ } while (c == ',');
+ overall_len += length;
+ if (c != ')') synerr();
+ c = (readchar)();
+ c = skipwhitespace(c);
+ } while (c == '(');
+// strcpy(buf, "do_");
+ *buf = 0;
+ if (ISALPHA(c)) {
+ c = readsymbol(c, buf, len);
+ c = skipwhitespace(c);
+ } else {
+ seq = def->opcode_seq;
+// strcat(buf, "bytecode");
+ while (seq) {
+ opc = seq->opcode_list;
+ if (*buf) strcat(buf, "_");
+ strcat(buf, bytecodes[opc->opcode].name);
+// sprintf(buf+strlen(buf), "_%ld", opc->opcode);
+ seq = seq->next;
+ }
+ }
+ name = strdup(buf);
+ if (!name) outmem();
+ def->name = name;
+ def->do_name = name;
+ def->len = overall_len;
+ if (c != '{') synerr();
+ c = (readchar)();
+ while (c != '\n' && isspace(c)) c = (readchar)();
+ if (c != '\n') synerr();
+ c = (readchar)();
+ c = readwhitespace(c, buf, len);
+ macrop = &(def->macro_impl);
+ while (c != '}' && c != EOF) {
+ c = readeol(c, buf + strlen(buf), len - strlen(buf));
+ line = strdup(buf);
+ if (!line) outmem();
+ macro = malloc(sizeof(StringList));
+ if (!macro) outmem();
+ *macrop = macro;
+ macrop = &(macro->next);
+ macro->next = 0;
+ macro->line = line;
+ c = readwhitespace(c, buf, len);
+ }
+ if (c != '}') synerr();
+ c = (readchar)();
+ c = skipwhitespace(c);
+ if (ISALPHA(c)) {
+ c = readsymbol(c, buf, len);
+ c = skipwhitespace(c);
+ name = strdup(buf);
+ if (!name) outmem();
+ def->do_name = name;
+ }
+ if (c == '[') {
+ c = (readchar)();
+ while (c != '\n' && isspace(c)) c = (readchar)();
+ if (c != '\n') synerr();
+ c = (readchar)();
+ c = readwhitespace(c, buf, len);
+ directp = &(def->direct_impl);
+ while (c != ']' && c != EOF) {
+ c = readeol(c, buf + strlen(buf), len - strlen(buf));
+ line = strdup(buf);
+ if (!line) outmem();
+ direct = malloc(sizeof(StringList));
+ if (!direct) outmem();
+ *directp = direct;
+ directp = &(direct->next);
+ direct->next = 0;
+ direct->line = line;
+ c = readwhitespace(c, buf, len);
+ }
+ if (c != ']') synerr();
+ c = (readchar)();
+ }
+ return c;
+}
+
+void mkbc(void)
+{
+ char buf[BUFLEN];
+ char *endptr;
+ int c;
+ char *name;
+ long opcode, len;
+
+ c = (readchar)();
+ c = skipwhitespace(c);
+ while (c != EOF) {
+ if (c == '#') {
+ c = skipeol(c);
+ } else if (ISALPHA(c)) {
+ c = readsymbol(c, buf, BUFLEN);
+ c = skipwhitespace(c);
+ if (c == '=') {
+ name = strdup(buf);
+ if (!name) outmem();
+ c = (readchar)();
+ c = skipwhitespace(c);
+ if (!(isdigit)(c)) synerr();
+ c = readsymbol(c, buf, BUFLEN);
+ opcode = strtol(buf, &endptr, 0);
+ if (*endptr != 0) synerr();
+ c = skipwhitespace(c);
+ if (c != ',') synerr();
+ c = (readchar)();
+ c = skipwhitespace(c);
+ if (!(isdigit)(c)) synerr();
+ c = readsymbol(c, buf, BUFLEN);
+ len = strtol(buf, &endptr, 0);
More information about the distro-pkg-dev
mailing list