fb-contrib-commit Mailing List for fb-contrib (Page 29)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1141
          http://fb-contrib.svn.sourceforge.net/fb-contrib/?rev=1141&view=rev
Author:   dbrosius
Date:     2009-03-15 04:28:50 +0000 (Sun, 15 Mar 2009)

Log Message:
-----------
reduce fps

Modified Paths:
--------------
    trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/LostExceptionStackTrace.java

Modified: trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/LostExceptionStackTrace.java
===================================================================

--- trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/LostExceptionStackTrace.java	2009-03-09 04:09:21 UTC (rev 1140)
+++ trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/LostExceptionStackTrace.java	2009-03-15 04:28:50 UTC (rev 1141)
@@ -108,11 +108,15 @@
 	 */
 	public boolean prescreen(Code code, Method method) {
 		if (method.isSynthetic())
-			return false;
+        {
+            return false;
+        }
 		
 		CodeException[] ce = code.getExceptionTable();
 		if ((ce == null) || (ce.length == 0))
-			return false;
+        {
+            return false;
+        }
 
 		BitSet bytecodeSet = getClassContext().getBytecodeSet(method);
 		return (bytecodeSet != null) && (bytecodeSet.get(Constants.ATHROW));
@@ -163,15 +167,18 @@
 			int pc = getPC();
 			for (CodeException ex : exceptions) {
 				if (pc == ex.getEndPC()) {
-                    if (ex.getCatchType() != 0)
+					if ((seen >= IRETURN) && (seen <= RETURN))
                     {
-    					if ((seen >= IRETURN) && (seen <= RETURN))
-    						addCatchBlock(ex.getHandlerPC(), Integer.MAX_VALUE);
-    					else if ((seen == GOTO) || (seen == GOTO_W))
-    						addCatchBlock(ex.getHandlerPC(), this.getBranchTarget());
-                        else
-                            addCatchBlock(ex.getHandlerPC(), Integer.MAX_VALUE);
+                        addCatchBlock(ex.getHandlerPC(), Integer.MAX_VALUE);
                     }
+                    else if ((seen == GOTO) || (seen == GOTO_W))
+                    {
+                        addCatchBlock(ex.getHandlerPC(), this.getBranchTarget());
+                    }
+                    else
+                    {
+                        addCatchBlock(ex.getHandlerPC(), Integer.MAX_VALUE);
+                    }
 				} else if (pc == ex.getHandlerPC()) {
                     removePreviousHandlers(pc);
                 }
@@ -183,7 +190,9 @@
 					CatchInfo catchInfo = it.next();
 					if (pc == catchInfo.getStart()) {
                         if (!updateExceptionRegister(catchInfo, seen, pc))
+                        {
                             it.remove();
+                        }
 						break;
 					} else if (pc > catchInfo.getFinish()) {
 						it.remove();
@@ -213,7 +222,9 @@
     									OpcodeStack.Item itm = stack.getStackItem(1);
     									int reg = itm.getRegisterNumber();
     									if (reg >= 0)
-    										exReg.put(Integer14.valueOf(reg), Boolean.TRUE);
+                                        {
+                                            exReg.put(Integer14.valueOf(reg), Boolean.TRUE);
+                                        }
     									markAsValid = true; // Fixes javac generated code
     								}
     							}
@@ -224,7 +235,9 @@
 							}
 						} else if ((seen == INVOKEINTERFACE) || (seen == INVOKESTATIC)) {
 							if (isPossibleExBuilder(catchInfo.getRegister()))
-								markAsValid = true;
+                            {
+                                markAsValid = true;
+                            }
 						} else if (seen == ATHROW) {
 							if (stack.getStackDepth() > 0) {
 								OpcodeStack.Item itm = stack.getStackItem(0);
@@ -253,7 +266,12 @@
 						} else if ((seen == ALOAD) || ((seen >= ALOAD_0) && (seen <= ALOAD_3))) {
 							Boolean valid = exReg.get(Integer14.valueOf(RegisterUtils.getALoadReg(this, seen)));
 							if (valid != null)
-								markAsValid = valid.booleanValue();
+                            {
+                                markAsValid = valid.booleanValue();
+                            }
+						} else if ((seen >= IRETURN) && (seen <= RETURN)) {
+						    removeIndeterminateHandlers(pc);
+						    break;
 						}
 					} 
 				} catch (ClassNotFoundException cnfe) {
@@ -292,7 +310,9 @@
 					for (int p = 0; p < numParms; p++) {
 						OpcodeStack.Item item = stack.getStackItem(p);
 						if (item.getRegisterNumber() == exReg)
-							return true;
+                        {
+                            return true;
+                        }
 					}
 				}
 			}
@@ -317,10 +337,24 @@
         while (it.hasNext()) {
             CatchInfo ci = it.next();
             if (ci.getStart() < pc)
+            {
                 it.remove();
+            }
         }
     }
     
+    private void removeIndeterminateHandlers(int pc)
+    {
+        Iterator<CatchInfo> it = catchInfos.iterator();
+        while (it.hasNext()) {
+            CatchInfo ci = it.next();
+            if ((ci.getStart() < pc) && (ci.getFinish() == Integer.MAX_VALUE))
+            {
+                it.remove();
+            }
+        }
+    }
+    
     /**
      * looks to update the catchinfo block with the register used for the 
      * exception variable. If their is a local variable table, but the local
@@ -343,10 +377,14 @@
                 if (lv != null) {
                     int finish = lv.getStartPC() + lv.getLength();
                     if (finish < ci.getFinish())
+                    {
                         ci.setFinish(finish);
+                    }
                 }
                 else
+                {
                     return false;
+                }
             }
         }
         return true;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2005	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (56)	Oct (60)	Nov (58)	Dec (89)
2006	Jan (66)	Feb (55)	Mar (85)	Apr (115)	May (35)	Jun (28)	Jul (3)	Aug (48)	Sep (37)	Oct (22)	Nov (14)	Dec (66)
2007	Jan (45)	Feb (63)	Mar (10)	Apr (1)	May (1)	Jun (12)	Jul	Aug	Sep (25)	Oct (21)	Nov (39)	Dec
2008	Jan (7)	Feb	Mar (26)	Apr (5)	May (2)	Jun (32)	Jul (9)	Aug (10)	Sep	Oct (3)	Nov (1)	Dec
2009	Jan (10)	Feb (31)	Mar (32)	Apr (35)	May (25)	Jun	Jul (31)	Aug (10)	Sep (95)	Oct (35)	Nov (10)	Dec (34)
2010	Jan (90)	Feb (4)	Mar (7)	Apr (20)	May (20)	Jun (13)	Jul (7)	Aug (18)	Sep (25)	Oct (4)	Nov (16)	Dec (2)
2011	Jan (1)	Feb	Mar (11)	Apr (3)	May (2)	Jun (26)	Jul (10)	Aug (2)	Sep	Oct (1)	Nov (1)	Dec (1)
2012	Jan (3)	Feb (4)	Mar	Apr	May	Jun	Jul (1)	Aug	Sep	Oct (14)	Nov (3)	Dec (4)
2013	Jan (3)	Feb (2)	Mar (1)	Apr (4)	May	Jun (1)	Jul (3)	Aug	Sep	Oct (4)	Nov (3)	Dec (3)
2014	Jan (4)	Feb (2)	Mar (4)	Apr (1)	May (2)	Jun	Jul (2)	Aug	Sep	Oct	Nov	Dec
2015	Jan	Feb	Mar	Apr	May (4)	Jun	Jul	Aug (3)	Sep	Oct	Nov (3)	Dec (3)
2016	Jan (2)	Feb	Mar	Apr (2)	May	Jun	Jul (1)	Aug (2)	Sep (4)	Oct (2)	Nov (7)	Dec
2017	Jan (1)	Feb	Mar (4)	Apr (5)	May (2)	Jun	Jul (2)	Aug	Sep (4)	Oct	Nov	Dec (3)
2018	Jan	Feb	Mar (2)	Apr	May (5)	Jun (2)	Jul (2)	Aug	Sep	Oct	Nov	Dec

fb-contrib-commit Mailing List for fb-contrib (Page 29)

fb-contrib-commit — Log for cvs commits of fb-contrib code