From: megacz Date: Fri, 30 Jan 2004 07:40:54 +0000 (+0000) Subject: 2003/11/03 06:32:56 X-Git-Tag: RC3~378 X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=b895fafa7b8cc7cdc00bef856eacb584c80c89e7 2003/11/03 06:32:56 darcs-hash:20040130074054-2ba56-1beca78e32630dd3ecba2930396f1249f7d8c908.gz --- diff --git a/src/org/xwt/js/Parser.java b/src/org/xwt/js/Parser.java index 70a497c..6ce0760 100644 --- a/src/org/xwt/js/Parser.java +++ b/src/org/xwt/js/Parser.java @@ -5,7 +5,7 @@ import org.xwt.util.*; import java.io.*; /** - * Parses a stream of lexed tokens into a tree of CompiledFunctionImpl's. + * Parses a stream of lexed tokens into a tree of Function's. * * There are three kinds of things we parse: blocks, statements, and * expressions. @@ -73,7 +73,7 @@ class Parser extends Lexer implements ByteCodes { /** for debugging */ public static void main(String[] s) throws Exception { - CompiledFunctionImpl block = new JS.CompiledFunction("stdin", 0, new InputStreamReader(System.in), null); + Function block = new Function("stdin", 0, new InputStreamReader(System.in), null); if (block == null) return; System.out.println(block); } @@ -142,14 +142,14 @@ class Parser extends Lexer implements ByteCodes { * bytecodes for that expression to appendTo; the * appended bytecodes MUST grow the stack by exactly one element. */ - private void startExpr(CompiledFunctionImpl appendTo, int minPrecedence) throws IOException { + private void startExpr(Function appendTo, int minPrecedence) throws IOException { int saveParserLine = parserLine; _startExpr(appendTo, minPrecedence); parserLine = saveParserLine; } - private void _startExpr(CompiledFunctionImpl appendTo, int minPrecedence) throws IOException { + private void _startExpr(Function appendTo, int minPrecedence) throws IOException { int tok = getToken(); - CompiledFunctionImpl b = appendTo; + Function b = appendTo; switch (tok) { case -1: throw pe("expected expression"); @@ -163,11 +163,11 @@ class Parser extends Lexer implements ByteCodes { case LB: { b.add(parserLine, ARRAY, new Integer(0)); // push an array onto the stack - int size0 = b.size(); + int size0 = b.size; int i = 0; if (peekToken() != RB) while(true) { // iterate over the initialization values - int size = b.size(); + int size = b.size; b.add(parserLine, LITERAL, new Integer(i++)); // push the index in the array to place it into if (peekToken() == COMMA || peekToken() == RB) b.add(parserLine, LITERAL, null); // for stuff like [1,,2,] @@ -194,7 +194,7 @@ class Parser extends Lexer implements ByteCodes { } case INC: case DEC: { // prefix (not postfix) startExpr(b, precedence[tok]); - int prev = b.size() - 1; + int prev = b.size - 1; if (b.get(prev) == GET && b.getArg(prev) != null) b.set(prev, LITERAL, b.getArg(prev)); else if(b.get(prev) == GET) @@ -237,7 +237,7 @@ class Parser extends Lexer implements ByteCodes { case FUNCTION: { consume(LP); int numArgs = 0; - CompiledFunctionImpl b2 = new JS.CompiledFunction(sourceName, parserLine, null, null); + Function b2 = new Function(sourceName, parserLine, null, null); b.add(parserLine, NEWFUNCTION, b2); // function prelude; arguments array is already on the stack @@ -297,12 +297,12 @@ class Parser extends Lexer implements ByteCodes { * expression that modifies the assignable. This method always * decreases the stack depth by exactly one element. */ - private void continueExprAfterAssignable(CompiledFunctionImpl b,int minPrecedence) throws IOException { + private void continueExprAfterAssignable(Function b,int minPrecedence) throws IOException { int saveParserLine = parserLine; _continueExprAfterAssignable(b,minPrecedence); parserLine = saveParserLine; } - private void _continueExprAfterAssignable(CompiledFunctionImpl b,int minPrecedence) throws IOException { + private void _continueExprAfterAssignable(Function b,int minPrecedence) throws IOException { if (b == null) throw new Error("got null b; this should never happen"); int tok = getToken(); if (minPrecedence != -1 && (precedence[tok] < minPrecedence || (precedence[tok] == minPrecedence && !isRightAssociative[tok]))) @@ -313,7 +313,7 @@ class Parser extends Lexer implements ByteCodes { case ASSIGN_MUL: case ASSIGN_DIV: case ASSIGN_MOD: case ASSIGN_ADD: case ASSIGN_SUB: { b.add(parserLine, GET_PRESERVE); startExpr(b, precedence[tok]); - int size = b.size(); + int size = b.size; if (tok == ASSIGN_ADD || tok == ASSIGN_SUB) { b.add(parserLine, tok); } @@ -322,7 +322,7 @@ class Parser extends Lexer implements ByteCodes { b.add(parserLine, PUT); b.add(parserLine, SWAP); b.add(parserLine, POP); - if (tok == ASSIGN_ADD || tok == ASSIGN_SUB) b.set(size, tok, new Integer(b.size() - size)); + if (tok == ASSIGN_ADD || tok == ASSIGN_SUB) b.set(size, tok, new Integer(b.size - size)); break; } case INC: case DEC: { // postfix @@ -347,8 +347,8 @@ class Parser extends Lexer implements ByteCodes { } default: { pushBackToken(); - if(b.get(b.size()-1) == LITERAL && b.getArg(b.size()-1) != null) - b.set(b.size()-1,GET,b.getArg(b.size()-1)); + if(b.get(b.size-1) == LITERAL && b.getArg(b.size-1) != null) + b.set(b.size-1,GET,b.getArg(b.size-1)); else b.add(parserLine, GET); return; @@ -368,12 +368,12 @@ class Parser extends Lexer implements ByteCodes { * If any bytecodes are appended, they will not alter the stack * depth. */ - private void continueExpr(CompiledFunctionImpl b, int minPrecedence) throws IOException { + private void continueExpr(Function b, int minPrecedence) throws IOException { int saveParserLine = parserLine; _continueExpr(b, minPrecedence); parserLine = saveParserLine; } - private void _continueExpr(CompiledFunctionImpl b, int minPrecedence) throws IOException { + private void _continueExpr(Function b, int minPrecedence) throws IOException { if (b == null) throw new Error("got null b; this should never happen"); int tok = getToken(); if (tok == -1) return; @@ -409,12 +409,12 @@ class Parser extends Lexer implements ByteCodes { } case OR: case AND: { b.add(parserLine, tok == AND ? b.JF : b.JT, new Integer(0)); // test to see if we can short-circuit - int size = b.size(); + int size = b.size; startExpr(b, precedence[tok]); // otherwise check the second value b.add(parserLine, JMP, new Integer(2)); // leave the second value on the stack and jump to the end b.add(parserLine, LITERAL, tok == AND ? new Boolean(false) : new Boolean(true)); // target of the short-circuit jump is here - b.set(size - 1, new Integer(b.size() - size)); // write the target of the short-circuit jump + b.set(size - 1, new Integer(b.size - size)); // write the target of the short-circuit jump break; } case DOT: { @@ -436,14 +436,14 @@ class Parser extends Lexer implements ByteCodes { } case HOOK: { b.add(parserLine, JF, new Integer(0)); // jump to the if-false expression - int size = b.size(); + int size = b.size; startExpr(b, minPrecedence); // write the if-true expression b.add(parserLine, JMP, new Integer(0)); // if true, jump *over* the if-false expression - b.set(size - 1, new Integer(b.size() - size + 1)); // now we know where the target of the jump is + b.set(size - 1, new Integer(b.size - size + 1)); // now we know where the target of the jump is consume(COLON); - size = b.size(); + size = b.size; startExpr(b, minPrecedence); // write the if-false expression - b.set(size - 1, new Integer(b.size() - size + 1)); // this is the end; jump to here + b.set(size - 1, new Integer(b.size - size + 1)); // this is the end; jump to here break; } case COMMA: { @@ -462,7 +462,7 @@ class Parser extends Lexer implements ByteCodes { } // parse a set of comma separated function arguments, assume LP has already been consumed - private int parseArgs(CompiledFunctionImpl b) throws IOException { + private int parseArgs(Function b) throws IOException { int i = 0; while(peekToken() != RP) { i++; @@ -477,13 +477,13 @@ class Parser extends Lexer implements ByteCodes { } /** Parse a block of statements which must be surrounded by LC..RC. */ - void parseBlock(CompiledFunctionImpl b) throws IOException { parseBlock(b, null); } - void parseBlock(CompiledFunctionImpl b, String label) throws IOException { + void parseBlock(Function b) throws IOException { parseBlock(b, null); } + void parseBlock(Function b, String label) throws IOException { int saveParserLine = parserLine; _parseBlock(b, label); parserLine = saveParserLine; } - void _parseBlock(CompiledFunctionImpl b, String label) throws IOException { + void _parseBlock(Function b, String label) throws IOException { if (peekToken() == -1) return; else if (peekToken() != LC) parseStatement(b, null); else { @@ -494,12 +494,12 @@ class Parser extends Lexer implements ByteCodes { } /** Parse a single statement, consuming the RC or SEMI which terminates it. */ - void parseStatement(CompiledFunctionImpl b, String label) throws IOException { + void parseStatement(Function b, String label) throws IOException { int saveParserLine = parserLine; _parseStatement(b, label); parserLine = saveParserLine; } - void _parseStatement(CompiledFunctionImpl b, String label) throws IOException { + void _parseStatement(Function b, String label) throws IOException { int tok = peekToken(); if (tok == -1) return; switch(tok = getToken()) { @@ -545,24 +545,24 @@ class Parser extends Lexer implements ByteCodes { consume(RP); b.add(parserLine, JF, new Integer(0)); // if false, jump to the else-block - int size = b.size(); + int size = b.size; parseStatement(b, null); if (peekToken() == ELSE) { consume(ELSE); b.add(parserLine, JMP, new Integer(0)); // if we took the true-block, jump over the else-block - b.set(size - 1, new Integer(b.size() - size + 1)); - size = b.size(); + b.set(size - 1, new Integer(b.size - size + 1)); + size = b.size; parseStatement(b, null); } - b.set(size - 1, new Integer(b.size() - size + 1)); // regardless of which branch we took, b[size] needs to point here + b.set(size - 1, new Integer(b.size - size + 1)); // regardless of which branch we took, b[size] needs to point here break; } case WHILE: { consume(LP); if (label != null) b.add(parserLine, LABEL, label); b.add(parserLine, LOOP); - int size = b.size(); + int size = b.size; b.add(parserLine, POP); // discard the first-iteration indicator startExpr(b, -1); b.add(parserLine, JT, new Integer(2)); // if the while() clause is true, jump over the BREAK @@ -570,14 +570,14 @@ class Parser extends Lexer implements ByteCodes { consume(RP); parseStatement(b, null); b.add(parserLine, CONTINUE); // if we fall out of the end, definately continue - b.set(size - 1, new Integer(b.size() - size + 1)); // end of the loop + b.set(size - 1, new Integer(b.size - size + 1)); // end of the loop break; } case SWITCH: { consume(LP); if (label != null) b.add(parserLine, LABEL, label); b.add(parserLine, LOOP); - int size0 = b.size(); + int size0 = b.size; startExpr(b, -1); consume(RP); consume(LC); @@ -589,9 +589,9 @@ class Parser extends Lexer implements ByteCodes { consume(COLON); b.add(parserLine, EQ); // check if we should do this case-block b.add(parserLine, JF, new Integer(0)); // if not, jump to the next one - int size = b.size(); + int size = b.size; while(peekToken() != CASE && peekToken() != DEFAULT && peekToken() != RC) parseStatement(b, null); - b.set(size - 1, new Integer(1 + b.size() - size)); + b.set(size - 1, new Integer(1 + b.size - size)); } else if (peekToken() == DEFAULT) { consume(DEFAULT); consume(COLON); @@ -603,14 +603,14 @@ class Parser extends Lexer implements ByteCodes { } else { throw pe("expected CASE, DEFAULT, or RC; got " + codeToString[peekToken()]); } - b.set(size0 - 1, new Integer(b.size() - size0 + 1)); // end of the loop + b.set(size0 - 1, new Integer(b.size - size0 + 1)); // end of the loop break; } case DO: { if (label != null) b.add(parserLine, LABEL, label); b.add(parserLine, LOOP); - int size = b.size(); + int size = b.size; parseStatement(b, null); consume(WHILE); consume(LP); @@ -620,27 +620,27 @@ class Parser extends Lexer implements ByteCodes { b.add(parserLine, CONTINUE); consume(RP); consume(SEMI); - b.set(size - 1, new Integer(b.size() - size + 1)); // end of the loop; write this location to the LOOP instruction + b.set(size - 1, new Integer(b.size - size + 1)); // end of the loop; write this location to the LOOP instruction break; } case TRY: { b.add(parserLine, TRY); // try bytecode causes a TryMarker to be pushed - int tryInsn = b.size() - 1; + int tryInsn = b.size - 1; // parse the expression to be TRYed parseStatement(b, null); // pop the try marker. this is pushed when the TRY bytecode is executed b.add(parserLine, POP); // jump forward to the end of the catch block, start of the finally block b.add(parserLine, JMP); - int successJMPInsn = b.size() - 1; + int successJMPInsn = b.size - 1; if (peekToken() != CATCH && peekToken() != FINALLY) throw pe("try without catch or finally"); int catchJMPDistance = -1; if (peekToken() == CATCH) { - catchJMPDistance = b.size() - tryInsn; + catchJMPDistance = b.size - tryInsn; String exceptionVar; getToken(); consume(LP); @@ -661,12 +661,12 @@ class Parser extends Lexer implements ByteCodes { } // jump here if no exception was thrown - b.set(successJMPInsn, new Integer(b.size() - successJMPInsn)); + b.set(successJMPInsn, new Integer(b.size - successJMPInsn)); int finallyJMPDistance = -1; if (peekToken() == FINALLY) { b.add(parserLine, LITERAL, null); // null FinallyData - finallyJMPDistance = b.size() - tryInsn; + finallyJMPDistance = b.size - tryInsn; consume(FINALLY); parseStatement(b, null); b.add(parserLine,FINALLY_DONE); @@ -695,7 +695,7 @@ class Parser extends Lexer implements ByteCodes { b.add(parserLine, LOOP); // we actually only add this to ensure that BREAK works b.add(parserLine, POP); // discard the first-iteration indicator - int size = b.size(); + int size = b.size; consume(NAME); consume(IN); startExpr(b, -1); @@ -717,7 +717,7 @@ class Parser extends Lexer implements ByteCodes { parseStatement(b, null); // do some stuff b.add(parserLine, CONTINUE); // continue if we fall out the bottom - b.set(size - 1, new Integer(b.size() - size + 1)); // BREAK to here + b.set(size - 1, new Integer(b.size - size + 1)); // BREAK to here b.add(parserLine, OLDSCOPE); // restore the scope } else { @@ -725,8 +725,8 @@ class Parser extends Lexer implements ByteCodes { b.add(parserLine, NEWSCOPE); // grab a fresh scope parseStatement(b, null); // initializer - CompiledFunctionImpl e2 = // we need to put the incrementor before the test - new JS.CompiledFunction(sourceName, parserLine, null, null); // so we save the test here + Function e2 = // we need to put the incrementor before the test + new Function(sourceName, parserLine, null, null); // so we save the test here if (peekToken() != SEMI) startExpr(e2, -1); else @@ -734,15 +734,15 @@ class Parser extends Lexer implements ByteCodes { consume(SEMI); if (label != null) b.add(parserLine, LABEL, label); b.add(parserLine, LOOP); - int size2 = b.size(); + int size2 = b.size; b.add(parserLine, JT, new Integer(0)); // if we're on the first iteration, jump over the incrementor - int size = b.size(); + int size = b.size; if (peekToken() != RP) { // do the increment thing startExpr(b, -1); b.add(parserLine, POP); } - b.set(size - 1, new Integer(b.size() - size + 1)); + b.set(size - 1, new Integer(b.size - size + 1)); consume(RP); b.paste(e2); // ok, *now* test if we're done yet @@ -750,7 +750,7 @@ class Parser extends Lexer implements ByteCodes { b.add(parserLine, BREAK); parseStatement(b, null); b.add(parserLine, CONTINUE); // if we fall out the bottom, CONTINUE - b.set(size2 - 1, new Integer(b.size() - size2 + 1)); // end of the loop + b.set(size2 - 1, new Integer(b.size - size2 + 1)); // end of the loop b.add(parserLine, OLDSCOPE); // get our scope back } diff --git a/upstream/libmspack-20030726/patches/libmspack.patch b/upstream/libmspack-20030726/patches/libmspack.patch new file mode 100644 index 0000000..ade411d --- /dev/null +++ b/upstream/libmspack-20030726/patches/libmspack.patch @@ -0,0 +1,25 @@ +--- ../libmspack.orig/mspack/Makefile Sat Jul 26 10:44:57 2003 ++++ mspack/Makefile Sun Nov 2 17:12:35 2003 +@@ -1,12 +1,13 @@ + CC=gcc + RM=rm -f + AR=ar ++RANLIB=ranlib + + WARNINGS=-Wall -Wsign-compare -Wconversion -pedantic + LARGEFILE=-std=c99 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE + DEBUG=-g -DDEBUG + OPTIM=-O3 +-CFLAGS= $(WARNINGS) $(LARGEFILE) $(DEBUG) $(OPTIM) -I. ++CFLAGS= $(WARNINGS) $(LARGEFILE) $(DEBUG) $(OPTIM) -I. -DMSPACK_NO_DEFAULT_SYSTEM + + all: libmspack.a + +@@ -27,6 +28,7 @@ + libmspack.a: $(OBJS) + -$(RM) $@ + $(AR) q $@ $(OBJS) ++ $(RANLIB) $@ + + .c.o: + $(CC) $(CFLAGS) -o $@ -c $<