/hg/icedtea6: Edward Nevill (ed at camswl.com)
enevill at icedtea.classpath.org
enevill at icedtea.classpath.org
Fri Oct 30 06:31:59 PDT 2009
changeset 547923046557 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=547923046557
author: "Edward Nevill (ed at camswl.com)"
date: Fri Oct 30 13:35:54 2009 +0000
Edward Nevill (ed at camswl.com)
diffstat:
8 files changed, 635 insertions(+), 638 deletions(-)
ChangeLog | 6
Makefile.am | 35 -
mkbc.c | 605 --------------------
ports/hotspot/build/linux/makefiles/zero.make | 10
ports/hotspot/src/cpu/zero/vm/asm_helper.cpp | 5
ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 4
ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 3
ports/hotspot/tools/mkbc.c | 605 ++++++++++++++++++++
diffs (truncated from 1373 to 500 lines):
diff -r fc2d2cedfcc9 -r 547923046557 ChangeLog
--- a/ChangeLog Fri Oct 30 12:07:39 2009 +0100
+++ b/ChangeLog Fri Oct 30 13:35:54 2009 +0000
@@ -1,3 +1,9 @@ 2009-10-22 Matthias Klose <doko at ubuntu
+2009-10-30 Edward Nevill <ed at camswl.com>
+
+ * move mkbc.c to hotspot/tools
+ * Fix ARM Shark build (add DISABLE_NOTICE_SAFEPOINTS)
+ * Fixes to build hs16 (incomplete - builds but is not stable)
+
2009-10-22 Matthias Klose <doko at ubuntu.com>
* patches/icedtea-no-precompiled.patch: Allow disabling of the
diff -r fc2d2cedfcc9 -r 547923046557 Makefile.am
--- a/Makefile.am Fri Oct 30 12:07:39 2009 +0100
+++ b/Makefile.am Fri Oct 30 13:35:54 2009 +0000
@@ -489,36 +489,10 @@ 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 $@
-
-# ECN: The following rule has been changed to allow preprocessing of the bytecode definition
-# file prior to running 'mkbc'. This allows you to use -DXXX on the gcc command. There are two
-# options currently recognized.
-#
-# -DDISABLE_NOTICE_SAFEPONTS - Always run in 'safe' mode.
-# -DDISABLE_FAST_BYTECODES - Disable fast bytecode replacement and bytecode sequences
-#
-# These options are provided mainly to assist debugging by returning the bytecode interpreter
-# to a 'vanilla' interpreter.
-#
-if SHARK_BUILD
-${ZERO_ASM_BC_ASM}: ${ZERO_ASM_BC_DEF} $(abs_top_srcdir)/mkbc
- gcc -E -DDISABLE_NOTICE_SAFEPOINTS - < $< | $(abs_top_srcdir)/mkbc - $@
-else
-${ZERO_ASM_BC_ASM}: ${ZERO_ASM_BC_DEF} $(abs_top_srcdir)/mkbc
- gcc -E - < $< | $(abs_top_srcdir)/mkbc - $@
-endif
-
-
# Copy ports sources into tree
stamps/ports.stamp: stamps/replace-hotspot.stamp
for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+ $(abs_top_srcdir)/ports/hotspot/tools \
$(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
$(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk/'|sed "s#hotspot/build#hotspot/$(HOTSPOT_MAKE_DIR)#"); \
@@ -1105,7 +1079,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 $(ZERO_ASM_BC_ASM_COND)
+ stamps/pulse-java.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk \
@@ -1202,7 +1176,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 $(ZERO_ASM_BC_ASM_COND)
+ stamps/pulse-java.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk \
@@ -1326,8 +1300,7 @@ stamps/native-ecj.stamp:
stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
- stamps/patch-ecj.stamp stamps/cacao.stamp \
- $(ZERO_ASM_BC_ASM_COND)
+ stamps/patch-ecj.stamp stamps/cacao.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_ECJ) \
-C openjdk-ecj/ \
diff -r fc2d2cedfcc9 -r 547923046557 mkbc.c
--- a/mkbc.c Fri Oct 30 12:07:39 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,605 +0,0 @@
-/*
- * Copyright 2009 Edward Nevill
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- */
-
-#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;
-
-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 == '#') {
- 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);
- if (*endptr != 0) synerr();
- bytecodes[opcode].name = name;
- bytecodes[opcode].len = len;
- }
- } else if (c == '(') {
- c = bcdef(c, buf, BUFLEN);
- } else synerr();
- c = skipwhitespace(c);
- }
-}
-
-typedef struct TableEntry {
- BytecodeImpl *impl;
- char *impl_name;
- char *def_name;
- struct TableEntry *subtable;
-} TableEntry;
-
-TableEntry *the_table;
-
-int is_duplicate(TableEntry *a, TableEntry *b)
-{
- int i;
- char buf[256];
-
- for (i = 0; i < 256; i++) {
- if (a[i].subtable || b[i].subtable) {
- if (!(a[i].subtable) || !(b[i].subtable)) return 0;
- if (!is_duplicate(a[i].subtable, b[i].subtable)) return 0;
- } else if (a[i].impl_name && b[i].impl_name) {
- if (strcmp(a[i].impl_name, b[i].impl_name) != 0)
- return 0;
- } else if (a[i].def_name && b[i].def_name) {
- if (strcmp(a[i].def_name, b[i].def_name) != 0)
- return 0;
- } else return 0;
- }
- return 1;
-}
-
-void remove_duplicates(TableEntry *table, int start, int *table_indices, int depth)
-{
- TableEntry *start_entry = table[start].subtable;
- int i, j;
-
- if (!start_entry) fatal("Subtable is NULL in remove_duplicates!!!");
- for (i = start+1; i < 256; i++) {
- if (table[i].subtable) {
- if (is_duplicate(start_entry, table[i].subtable)) {
- fputs("dispatch", bci_f);
- for (j = 0; j < depth; j++) {
- fputc('_', bci_f);
- fputs(bytecodes[table_indices[j]].name, bci_f);
- }
- fputc('_', bci_f);
- fputs(bytecodes[i].name, bci_f);
- fputs(":\n", bci_f);
- free(table[i].subtable);
- table[i].subtable = 0;
- }
- }
- }
-}
-
-void writeouttable(TableEntry *table, int *table_indices, int depth)
-{
- int i, j;
- int len;
-
- for (i = 0; i < 256; i++) {
- if (table[i].subtable) {
- len = 0;
- fputs("\t.word\tdispatch", bci_f);
- table_indices[depth] = i;
- for (j = 0; j <= depth; j++) {
- fputc('_', bci_f);
- fputs(bytecodes[table_indices[j]].name, bci_f);
- len += bytecodes[table_indices[j]].len;
- }
- fprintf(bci_f, "+%d\n", len);
- } else {
- if (table[i].impl_name)
- fprintf(bci_f, "\t.word\t%s%s\n", prefix, table[i].impl_name);
- else
- fprintf(bci_f, "\t.word\t%s%s\n", prefix, table[i].def_name);
- }
- }
- if (depth == 0) {
- fputs("\t.endm\n", bci_f);
- fputs("\t.macro\tSUB_DISPATCH_TABLES\n", bci_f);
- }
- for (i = 0; i < 256; i++) {
- if (table[i].subtable) {
- fputs("dispatch", bci_f);
- table_indices[depth] = i;
More information about the distro-pkg-dev
mailing list