Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FatBlock is moved to Block as a private class

Browse Source
This commit is contained in:
igor%mir2.org 2004-05-07 15:03:39 +00:00
parent 09b1d12d63
commit fd2bfff2a7
3 changed files with 73 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
js/rhino/src/org/mozilla/javascript/optimizer/Block.java
View File

@ -19,6 +19,7 @@
*
* Contributor(s):
* Norris Boyd
* Igor Bukanov
* Roger Lawrence
*
* Alternatively, the contents of this file may be used under the
@ -44,24 +45,74 @@ import java.util.Enumeration;
import java.io.PrintWriter;
import java.io.StringWriter;
public class Block {
class Block
{
public Block(int startNodeIndex, int endNodeIndex, Node[] statementNodes)
private static class FatBlock
{
FatBlock(int startNodeIndex, int endNodeIndex, Node[] statementNodes)
{
realBlock = new Block(startNodeIndex, endNodeIndex, statementNodes);
}
private static Block[] reduceToArray(ObjToIntMap map)
{
Block[] result = null;
if (!map.isEmpty()) {
result = new Block[map.size()];
int i = 0;
ObjToIntMap.Iterator iter = map.newIterator();
for (iter.start(); !iter.done(); iter.next()) {
FatBlock fb = (FatBlock)(iter.getKey());
result[i++] = fb.realBlock;
}
}
return result;
}
void addSuccessor(FatBlock b) { successors.put(b, 0); }
void addPredecessor(FatBlock b) { predecessors.put(b, 0); }
Block[] getSuccessors() { return reduceToArray(successors); }
Block[] getPredecessors() { return reduceToArray(predecessors); }
// all the Blocks that come immediately after this
private ObjToIntMap successors = new ObjToIntMap();
// all the Blocks that come immediately before this
private ObjToIntMap predecessors = new ObjToIntMap();
Block realBlock;
}
private static class CSEHolder
{
CSEHolder(Node parent, Node child)
{
getPropParent = parent;
getPropChild = child;
}
Node getPropParent;
Node getPropChild;
}
Block(int startNodeIndex, int endNodeIndex, Node[] statementNodes)
{
itsStartNodeIndex = startNodeIndex;
itsEndNodeIndex = endNodeIndex;
itsStatementNodes = statementNodes;
}
public void setBlockID(int id) { itsBlockID = id; }
public int getBlockID() { return itsBlockID; }
public Node getStartNode() { return itsStatementNodes[itsStartNodeIndex]; }
public Node getEndNode() { return itsStatementNodes[itsEndNodeIndex]; }
void setBlockID(int id) { itsBlockID = id; }
int getBlockID() { return itsBlockID; }
Node getStartNode() { return itsStatementNodes[itsStartNodeIndex]; }
Node getEndNode() { return itsStatementNodes[itsEndNodeIndex]; }
public Block[] getPredecessorList() { return itsPredecessors; }
public Block[] getSuccessorList() { return itsSuccessors; }
Block[] getPredecessorList() { return itsPredecessors; }
Block[] getSuccessorList() { return itsSuccessors; }
public static Block[] buildBlocks(Node[] statementNodes)
static Block[] buildBlocks(Node[] statementNodes)
{
// a mapping from each target node to the block it begins
Hashtable theTargetBlocks = new Hashtable();
@ -117,7 +168,7 @@ public class Block {
for (int i = 0; i < theBlocks.size(); i++) {
FatBlock fb = (FatBlock)(theBlocks.get(i));
Node blockEndNode = fb.getEndNode();
Node blockEndNode = fb.realBlock.getEndNode();
int blockEndNodeType = blockEndNode.getType();
if ((blockEndNodeType != Token.GOTO)
@ -135,7 +186,7 @@ public class Block {
FatBlock branchTargetBlock
= (FatBlock)(theTargetBlocks.get(target));
target.putProp(Node.TARGETBLOCK_PROP,
branchTargetBlock.getSlimmerSelf());
branchTargetBlock.realBlock);
fb.addSuccessor(branchTargetBlock);
branchTargetBlock.addPredecessor(fb);
}
@ -145,15 +196,20 @@ public class Block {
for (int i = 0; i < theBlocks.size(); i++) {
FatBlock fb = (FatBlock)(theBlocks.get(i));
result[i] = fb.diet();
result[i].setBlockID(i);
Block b = fb.realBlock;
b.setSuccessorList(fb.getSuccessors());
b.setPredecessorList(fb.getPredecessors());
b.setBlockID(i);
result[i] = b;
}
return result;
}
public static String toString(Block[] blockList, Node[] statementNodes)
static String toString(Block[] blockList, Node[] statementNodes)
{
if (!Optimizer.DEBUG_OPTIMIZER) return null;
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
@ -651,8 +707,8 @@ public class Block {
}
}
public void setSuccessorList(Block[] b) { itsSuccessors = b; }
public void setPredecessorList(Block[] b) { itsPredecessors = b; }
void setSuccessorList(Block[] b) { itsSuccessors = b; }
void setPredecessorList(Block[] b) { itsPredecessors = b; }
// all the Blocks that come immediately after this
private Block[] itsSuccessors;
@ -673,15 +729,3 @@ public class Block {
}
class CSEHolder {
CSEHolder(Node parent, Node child)
{
getPropParent = parent;
getPropChild = child;
}
Node getPropParent;
Node getPropChild;
}

90
js/rhino/src/org/mozilla/javascript/optimizer/FatBlock.java
View File

@ -1,90 +0,0 @@
/*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is Rhino code, released
* May 6, 1999.
*
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1997-1999 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
* Norris Boyd
* Roger Lawrence
*
* Alternatively, the contents of this file may be used under the
* terms of the GNU Public License (the "GPL"), in which case the
* provisions of the GPL are applicable instead of those above.
* If you wish to allow use of your version of this file only
* under the terms of the GPL and not to allow others to use your
* version of this file under the NPL, indicate your decision by
* deleting the provisions above and replace them with the notice
* and other provisions required by the GPL. If you do not delete
* the provisions above, a recipient may use your version of this
* file under either the NPL or the GPL.
*/
package org.mozilla.javascript.optimizer;
import org.mozilla.javascript.*;
public class FatBlock {
public FatBlock(int startNodeIndex, int endNodeIndex,
Node[] statementNodes)
{
itsShadowOfFormerSelf = new Block(startNodeIndex,
endNodeIndex, statementNodes);
}
public Node getEndNode()
{ return itsShadowOfFormerSelf.getEndNode(); }
public Block getSlimmerSelf()
{ return itsShadowOfFormerSelf; }
private Block[] reduceToArray(ObjToIntMap map)
{
Block[] result = null;
if (!map.isEmpty()) {
result = new Block[map.size()];
int i = 0;
ObjToIntMap.Iterator iter = map.newIterator();
for (iter.start(); !iter.done(); iter.next()) {
FatBlock fb = (FatBlock)(iter.getKey());
result[i++] = fb.itsShadowOfFormerSelf;
}
}
return result;
}
Block diet()
{
itsShadowOfFormerSelf.setSuccessorList(reduceToArray(itsSuccessors));
itsShadowOfFormerSelf.setPredecessorList(reduceToArray(itsPredecessors));
return itsShadowOfFormerSelf;
}
public void addSuccessor(FatBlock b) { itsSuccessors.put(b, 0); }
public void addPredecessor(FatBlock b) { itsPredecessors.put(b, 0); }
// all the Blocks that come immediately after this
private ObjToIntMap itsSuccessors = new ObjToIntMap();
// all the Blocks that come immediately before this
private ObjToIntMap itsPredecessors = new ObjToIntMap();
private Block itsShadowOfFormerSelf;
}

2
js/rhino/src/org/mozilla/javascript/optimizer/Optimizer.java
View File

@ -720,7 +720,7 @@ class Optimizer
}
private static final boolean DEBUG_OPTIMIZER = false;
static final boolean DEBUG_OPTIMIZER = false;
private static int debug_blockCount;
private int itsOptLevel;