root/projects/bberry/coddec.patch

src/net/rim/tools/a/coddec.java

@@ -18 +18 @@
-        private static Hashtable _codfiles = null;
-        private static Hashtable _imports = null;
-        private static StringBuffer _output = null;
+        public static String currentFileHackCrap;
-        
-        public coddec ()
-        {
@@ -88 +89 @@
-        {
-                String s1= "";
-                net.rim.tools.compiler.codfile.Module _module_ = (net.rim.tools.compiler.codfile.Module)_modules.get(__moduleName);
+                System.err.println(">>>>>>>>>>>>>>>>>>>>>>>>>>");
+                System.err.println(">>>> Attempting to parse " + __moduleName + ".cod");
+                System.err.println(">>>>>>>>>>>>>>>>>>>>>>>>>>");
-                if (_module_ == null)
-                {
-                        
@@ -129 +133 @@
-        
-        public static String getTypeName (net.rim.tools.compiler.codfile.TypeItem __typeItem)
-        {
-
+ String _origTypeName_="";
-                
-                if (__typeItem != null)
-                {
-                        _typeName_ = __typeItem.getTypeName();
+                        _origTypeName_ = __typeItem.getTypeName();
-                        
-                        if (_typeName_.contains("."))
-                        {
@@ -155 +160 @@
-                }
-                else
-                        _typeName_ = "void";
-
+ + " /*"+_origTypeName_+"*/ "
-        }
-        
-        public static String getTypeName (net.rim.tools.compiler.codfile.ClassDef __classDef)
@@ -480 +485 @@
-                                        __message.append(getTypeName( _type_) + " ");
-                                        
-                                        // Field name
+                                        // The field.getName.get_Name does not jive with the members in the disassembled code
+                                        // (are they different objects???.......) so always use the offset (maybe)
-                                        if (!(_field_.getName().get_Name() != null && _field_.getName().get_Name().length() == 0))
-                                                __message.append (_field_.getName().get_Name() + " ");
-                                        // Changes
-                                        // We leave only defined fields, not fields by offset
-
+ {
-                                                __message.append ("field_" + _field_.getOffset() + " ");
+                                        }
-                                        
-                                        // Field initial value
-                                        if (!_clinit_)
@@ -495 +503 @@
-                                                //_code_.
-                                        }
-                                        // End of field section
-
+
+
+
-                                }
-                                __message.append("\r\n");
-                        }
@@ -672 +682 @@
-                                        {
-                                                case 0:
-                                                        _routineLocal_ = (net.rim.tools.compiler.codfile.RoutineLocal)_classDefLocal_.getStaticRoutine(i);
+                                                        System.out.println("STAT " + _routineLocal_.get_Name());
+                                                        System.out.println("STAT OF" + _routineLocal_.getAddress());
+                                                        System.out.println("STAT OF" + _routineLocal_.getOffset());
+                                                        System.out.println("STAT OR" + _routineLocal_.getOrdinal());
+                                                        System.out.println("STAT V1" + _routineLocal_.getVTableOffset(true));
+                                                        System.out.println("STAT V2" + _routineLocal_.getVTableOffset(false));
-                                                        break;
-                                                case 1:
-                                                        _routineLocal_ = (net.rim.tools.compiler.codfile.RoutineLocal)_classDefLocal_.get_nonVirtualRoutine(i);
+                                                        System.out.println("NVRT " + _routineLocal_.get_Name());
+                                                        System.out.println("NVRT OF" + _routineLocal_.getAddress());
+                                                        System.out.println("NVRT OF" + _routineLocal_.getOffset());
+                                                        System.out.println("NVRT OR" + _routineLocal_.getOrdinal());
+                                                        System.out.println("NVRT V1" + _routineLocal_.getVTableOffset(true));
+                                                        System.out.println("NVRT V2" + _routineLocal_.getVTableOffset(false));
-                                                        break;
-                                                case 2:
-                                                        _routineLocal_ = (net.rim.tools.compiler.codfile.RoutineLocal)_classDefLocal_.getVirtualRoutine(i);
+                                                        System.out.println("VIRT " + _routineLocal_.get_Name());
+                                                        System.out.println("VIRT OF" + _routineLocal_.getAddress());
+                                                        System.out.println("VIRT OF" + _routineLocal_.getOffset());
+                                                        System.out.println("VIRT OR" + _routineLocal_.getOrdinal());
+                                                        System.out.println("VIRT V1" + _routineLocal_.getVTableOffset(true));
+                                                        System.out.println("VIRT V2" + _routineLocal_.getVTableOffset(false));
-                                                        break;
-                                                default:
-                                                        break;
@@ -710 +738 @@
-                                        //if (_routineAttributes.length() != 0)
-                                        //{
-                                        __message.append(_routineAttributesString_);
+                                        System.err.println("APPEND AS " + _routineAttributesString_);
-                                        //}
-                                        //else
-                                        //      break;
-                                        
-                                        __message.append(_routineLocal_.get_Name());
+                                        System.err.println("APPEND NM " + _routineLocal_.get_Name());
-                                        // Return type
-                                        //net.rim.tools.compiler.codfile.TypeItem _returnType_ = _routineLocal_.getTypeList().get_baseType();
-                                        //__message.append(getTypeName(_returnType_) + " ");
@@ -733 +763 @@
-                                        //CHANGES:
-                                        //ADDED semi-colon after function header
-                                        __message.append(";");
+                                        
+                                        __message.append(" // address: " + _routineLocal_.getAddress());
+                                        
-                                        __message.append("\r\n");
-                                        
-                                        // exceptions
@@ -838 +871 @@
-                {
-                        if(!_packageFolder_.mkdirs())
-                        {
-out
+err
-                                _packagePath_ = "";
-                                return _packagePath_;
-                        }
@@ -856 +889 @@
-                        StringBuffer _stringBuf_ = new StringBuffer();
-                        StringBuffer _importsBuf_ = new StringBuffer("");
-                        
-
+
+
+
+
+
+
-                        FileOutputStream _javaOutputStream_ = new FileOutputStream(_pathString);
-                        try
-                        {
@@ -931 +969 @@
-                }
-        }
-        
-rivate
+ublic
-        {
-                File _file_ = new File(__fileName);
-                if (_file_.exists())
@@ -979 +1017 @@
-                        for (int k = 0; k < i; k++)
-                        {
-                                String s = args[k];
+                                _coddec.currentFileHackCrap = s.replaceFirst(".cod", "");;
-                                parseFile(s);
-                                
-                                net.rim.tools.compiler.codfile.Module _module_ = null;

src/net/rim/tools/compiler/codfile/ClassDef.java

@@ -181 +181 @@
-        }
-    }
-
-flag
+isStatic
-    {
+        if (!isStatic) {
+                System.out.println("----------------- addFieldDef");
+                try {
+                        throw new Exception("yay");
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+        }
-        net.rim.tools.compiler.codfile.CodfileArray o1 = null;
-flag
+isStatic
-        {
-            if(_staticFieldDefs == null)
-flag
+isStatic
-            o1 = _staticFieldDefs;
-        } else
-        {
-            if(_fieldDefs == null)
-flag
+isStatic
-            o1 = _fieldDefs;
-        }
-        int i = o1.getExtent();

src/net/rim/tools/compiler/codfile/ClassRef.java

@@ -45 +45 @@
-        int j = a2.readUnsignedShort();
-        _module = k1.getModule(j);
-        net.rim.tools.compiler.codfile.DataBytes a1_1 = k1.getDataBytes();
-
-
+
+
+
+
+
+
+
-        _bgvV();
-        z_hnI = a2.readUnsignedByte();
-        z_hjI = a2.readUnsignedByte();
-        if(j != 0)
-            if(_module instanceof net.rim.tools.compiler.codfile.ModuleDomestic)
-            {
+                System.out.println("---- DOMESTIC");
-                _classDef = new net.rim.tools.compiler.codfile.ClassDefForeign(k1, _module, _packageName, _className);
-                _module._ifuV(_classDef);
-            } else
-            if(_module instanceof net.rim.tools.compiler.codfile.ModuleRef)
-            {
+                System.out.println("---- REF");
-                net.rim.tools.compiler.codfile.ModuleRef g1 = (net.rim.tools.compiler.codfile.ModuleRef)_module;
-                _classDef = new net.rim.tools.compiler.codfile.ClassDefDomestic(k1, _module, _packageName, _className);
-                g1._auvV(_classDef, z_hjI);
-            } else
-            if(_module instanceof net.rim.tools.compiler.codfile.ModuleForeign)
-            {
+                System.out.println("---- FOREIGN");
-                net.rim.tools.compiler.codfile.ModuleForeign au1 = (net.rim.tools.compiler.codfile.ModuleForeign)_module;
-                _classDef = new net.rim.tools.compiler.codfile.l(k1, _module, _packageName, _className);
-                au1._ifuvV(_classDef, z_hjI);
-            } else
-            if(_module instanceof net.rim.tools.compiler.codfile.ModuleNull)
-            {
+                System.out.println("---- NULL");
-                _classDef = new net.rim.tools.compiler.codfile.ClassDefNull(k1, _packageName, _className);
-                _classDef.setModule(_module);
-            }

src/net/rim/tools/compiler/codfile/DataSection.java

@@ -61 +61 @@
-    private boolean _aliasesFlag;
-    private boolean z_eYZ;
-    private boolean z_e7Z;
+    private boolean fh;
+    private boolean _isVersion6;
-    private net.rim.tools.compiler.codfile.CodfileVector _fixedFields;
-    private net.rim.tools.compiler.codfile.CodfileVector _classDataFixups;
-    private net.rim.tools.compiler.codfile.CodfileVector _nativeRoutines;
@@ -94 +96 @@
-        _fieldsFixups = new net.rim.tools.compiler.codfile.CodfileVector(2, true);
-        _localFieldsFixups = new net.rim.tools.compiler.codfile.CodfileVector(2, true);
-        _staticFieldsFixups = new net.rim.tools.compiler.codfile.CodfileVector(2, true);
+        _isVersion6 = false;
+        fh = true;
-        z_eGZ = true;
-        z_e4Z = true;
-        _moduleCodeFixups = new net.rim.tools.compiler.codfile.CodfileVector(2, true);
@@ -127 +131 @@
-        _nativeRoutines = new net.rim.tools.compiler.codfile.CodfileVector(2, true);
-        _nativeRoutines.setTableName("native routine table");
-        _moduleCodeFixups.setTableName("module code fixup table");
-
+
+
+
+
+
+
+
+
+
-    }
-
-    public void read(net.rim.tools.compiler.io.StructuredInputStream __input, boolean flag)
@@ -137 +149 @@
-        _Flags = __input.readUnsignedByte() & 0x37;
-        _Version = __input.readUnsignedByte();
-        z_eYZ = false;
+        fh = false;
-        z_eGZ = false;
-        z_e4Z = false;
-        z_e7Z = false;
-        if(_Version >= 4)
-        {
-            z_eYZ = true;
+            fh = true;
-            z_e4Z = true;
-            if(_Version >= 5)
-            {
-                z_e7Z = true;
-                z_eGZ = true;
-            }
+            if(_Version >= 6)
+            {
+                _isVersion6 = true;
+                z_eYZ = false;
+                fh = false;
+                z_eGZ = false;
+                z_e4Z = false;
+                z_e7Z = false;
+            }
-        }
+        System.out.println("!!!! VERSION = " + Integer.toString(_Version));
-        if(!_aliasesFlag);
-        _iCallsNumber = __input.readUnsignedShort();
-        int _numModules_ = __input.readUnsignedByte();
@@ -271 +295 @@
-        process_intdStaticData(__input, l, flag);
-        __input.moveCurrentIdxtoOffset(_offsetClassRefs_);
-        addClassRefs(__input, _routineFixups.getOffset());
+/*        
-        if(!z_eYZ)
-            _doaZ(__input, _routineFixups, flag);
-        else
-
+ // I think this is wrong... new version assigns retval of this to another flag
-        z_e4Z = _doaZ(__input, _staticRoutineFixups, flag);
-        _doaZ(__input, _virtualRoutineFixups, flag);
-        if(!z_eYZ) //!z_eYZ --- demo files from BB JDE produce error here when !z_eYZ
@@ -293 +318 @@
-            _aaV(__input, _moduleCodeFixups, false);
-        else
-            addInterfaceMethodRefs(__input, flag);
+  */      
+        if(!z_eYZ)
+                _doaZ(__input, _routineFixups, true, flag);
+        else
+                fh = _ifaZ(__input, _routineFixups, true, flag);
+        if(!z_eYZ)
+            _doaZ(__input, _staticRoutineFixups, true, flag);
+        else
+            z_e4Z = _ifaZ(__input, _staticRoutineFixups, true, flag);
+        _doaZ(__input, _virtualRoutineFixups, true, flag);
+        if(!z_eYZ)
+            _aaV(__input, _classCodeFixups);
+        else
+            create_classDefFixupTable(__input, _classCodeFixups);
+        if(!_aliasesFlag)
+            _aaV(__input, _classDataFixups);
+        _doaZ(__input, _fieldsFixups, false, flag);
+        _foraV(__input, _localFieldsFixups, flag);
+        if(!z_eGZ)
+            _doaZ(__input, _staticFieldsFixups, false, flag);
+        else
+            z_eGZ = _ifaZ(__input, _staticFieldsFixups, false, flag);
+        if(_aliasesFlag)
+            _aaV(__input, _moduleCodeFixups, false);
+        else
+            addInterfaceMethodRefs(__input, flag);
+        
+        
-        __input.verifySlack(4);
-        setExtent(__input.getOffset());
-        byte abyte0[] = _codFile._bKvaB();
@@ -339 +392 @@
-            _aagBIV(_moduleCodeFixups, abyte1, i2);
-        if(!flag)
-        {
-
+
+
+
-                _foraBIV(abyte1, i2);
+            /*update_staticRoutineFixupTable(abyte1, i2);*/
+                if(!z_e4Z)
-            update_staticRoutineFixupTable(abyte1, i2);
-            _intaBIV(abyte1, i2);
-            update_fieldFixupTable(_fieldsFixups, abyte1, i2);
@@ -496 +553 @@
-    {
-        __input.verifySlack(_classRefs.getAlign());
-        __input.verifyOffset(_classRefs.getOffset(), "class refs");
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    public void _amvV()
@@ -516 +583 @@
-
-    }
-
-
+mebbeIsRoutineFixups, boolean 
-        throws IOException
-    {
-        boolean flag1 = true;
+        boolean needsAdvancedMemberRef = mebbeIsRoutineFixups && _isVersion6;
-        __input.verifySlack(ag1.getAlign());
-        __input.verifyOffset(ag1.getOffset(), "member fixup table");
-l = 
+elementSize = needsAdvancedMemberRef ? net.rim.tools.compiler.codfile.AdvancedMemberRef._SvI() : net.rim.tools.compiler.codfile.
-        int i1 = __input.readShort();
+        System.out.println("Read " + Integer.toString(i1) + " members, each " + Integer.toString(elementSize) + "bytes");
-        if(i1 < 0)
-        {
-            i1 = -i1;
@@ -535 +604 @@
-            __input.verifySlack(2);
-            if(flag)
-            {
-l
+elementSize
-                if(_aliasesFlag)
-                {
-                                        int k1 = __input.readUnsignedShort1();
@@ -547 +616 @@
-                }
-            } else
-            {
-
-
+
+
+
+
+
+
-            }
-        }
-
-        return flag1;
-    }
-
-
+ boolean mebbeIsRoutineFixups, 
-        throws IOException
-    {
-        boolean flag1 = true;
+        boolean needsAdvancedMemberRef = mebbeIsRoutineFixups && _isVersion6;
-        __input.verifySlack(__codFileVector.getAlign());
-        __input.verifyOffset(__codFileVector.getOffset(), "implied member fixup table");
-l = 
+elementSize = needsAdvancedMemberRef ? net.rim.tools.compiler.codfile.AdvancedMemberRef._SvI() : net.rim.tools.compiler.codfile.
-        int i1 = __input.readShort();
+        System.out.println("Read " + Integer.toString(i1) + " members, each " + Integer.toString(elementSize) + "bytes");
-        if(i1 < 0)
-        {
-            i1 = -i1;
-            flag1 = false;
-            __codFileVector.negatePrefix();
-        }
+        if (!flag1) System.out.println(">>>>><<<<<");
-        for(int j1 = 0; j1 < i1; j1++)
-        {
-            __input.verifySlack(2);
-            if(flag)
-            {
-l
+elementSize
-                if(!flag1)
-                    if(_aliasesFlag)
-                    {
@@ -587 +663 @@
-                    }
-            } else
-            {
-
-
+
+
+
+
+
-            }
-        }
-
@@ -832 +911 @@
-        }
-    }
-
-_yIa5
+getVirtualRoutine
-        throws IOException
-    {
-        Object obj = null;
@@ -846 +925 @@
-        {
-            obj = new net.rim.tools.compiler.codfile.RoutineNull(_ClassDef, this);
-            ((net.rim.tools.compiler.codfile.CodfileItem) (obj)).setAddress(l);
+            
+            /* equals/toString via observed behavior */
+            switch (l) {
+            case 1:
+                ((net.rim.tools.compiler.codfile.Member) (obj))._ifStringvV("equals", 0);
+                        break;
+            case 2:
+                ((net.rim.tools.compiler.codfile.Member) (obj))._ifStringvV("toString", 0);
+                        break;
+                        
+                default:
-            ((net.rim.tools.compiler.codfile.Member) (obj))._ifStringvV("virtual_", l);
+                        break;
+            }
-        }
-        return ((net.rim.tools.compiler.codfile.Routine) (obj));
-    }
@@ -872 +964 @@
-        }
-    }
-
-_tIw
+getField
-        throws IOException
-    {
-        if(l < -1)
@@ -886 +978 @@
-        net.rim.tools.compiler.codfile.TypeList p = _TypeLists.getNullTypeList();
-        net.rim.tools.compiler.codfile.FieldDefLocal ab1 = new net.rim.tools.compiler.codfile.FieldDefLocal(_ClassDef, ak1, p, false);
-        ab1.setAddress(l);
-
++l+"_"
-        return ab1;
-    }
-
@@ -1623 +1715 @@
-        }
-    }
-
+    public void cockItUp()
+    {
+        for (int i =0; i < _modules.size(); i++) {
+                net.rim.tools.compiler.codfile.Module m = (net.rim.tools.compiler.codfile.Module)_modules.elementAt(i);
+                if (m == null) continue;
+                System.out.println("$$ " + i + " " + m.get_Name() + " " + m.get_name_1() + " " + m.get_name_2() + " ");
+                m.cockItUp();
+        }
+    }
+
-    public net.rim.tools.compiler.codfile.ClassDef findClassDef(int __moduleOrdinal, int __classOrdinal)
-        throws IOException
-    {
@@ -1630 +1732 @@
-            return _ClassDef;
-        if(__moduleOrdinal == 0)
-            return getClassDef(__moduleOrdinal, __classOrdinal);
+        //System.out.println(">> findClassDef(" + __moduleOrdinal + ", " + __classOrdinal + ")");
-        net.rim.tools.compiler.codfile.Module af1 = (net.rim.tools.compiler.codfile.Module)_modules.elementAt(__moduleOrdinal);
-        if((af1 instanceof net.rim.tools.compiler.codfile.ModuleRef) || (af1 instanceof net.rim.tools.compiler.codfile.ModuleForeign))
-            return af1.getClassDef(__classOrdinal);
+        int __origClassOrd = __classOrdinal;
+        //System.out.println(">>> We have " + _classRefs.size() + " class refs");
-        for(int j1 = _classRefs.size(); __classOrdinal < j1; __classOrdinal += 256)
-        {
-            net.rim.tools.compiler.codfile.ClassRef at1 = (net.rim.tools.compiler.codfile.ClassRef)_classRefs.elementAt(__classOrdinal);
+            //System.out.println(">>>> Try classord " + __classOrdinal + " hiz modord is " + at1.getModuleNum());
-            if(at1.getModuleNum() == __moduleOrdinal)
-                return at1.getClassDef();
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    public net.rim.tools.compiler.codfile.ClassRef getClassRef(int __offset)
@@ -1714 +1842 @@
-            return _virtualRoutineFixups;
-        }
-        return null;
+    }
+    
+    public boolean isVersion6()
+    {
+        return _isVersion6;
-    }
-}

src/net/rim/tools/compiler/codfile/FieldDefLocal.java

@@ -24 +24 @@
-        super(u1, ak1, p, flag);
-    }
-
-flag
+isStatic
-        throws IOException
-    {
-flag
+isStatic
-        read(a2, k1);
-    }
-
@@ -51 +51 @@
-    protected int addFixup(net.rim.tools.compiler.io.StructuredOutputStream c1, net.rim.tools.compiler.codfile.ClassDef u1)
-    {
-        int i = -1;
-
+
+
-            i = super.addFixup(c1, u1);
-
+} 
-        if(super._ordinal > 255)
-        {
+                System.out.println("LLINGO 2");
-            Object obj = c1.getCookie();
-            if(obj != null)
-            {
@@ -70 +72 @@
-            Object obj1 = c1.getCookie();
-            if(obj1 != null)
-            {
+                System.out.println("LLINGO 3");
-                if(super._fixups == null)
-                {
-                    super._fixups = new net.rim.tools.compiler.codfile.FixupTableEntry(1);
@@ -141 +144 @@
-                k1._foranV(super._fixups);
-    }
-
-_ifZI
+elementSize
-    {
-        return flag ? 6 : 4;
-    }

src/net/rim/tools/compiler/codfile/MemberRef.java

@@ -46 +46 @@
-    public MemberRef(net.rim.tools.compiler.io.StructuredInputStream __input, net.rim.tools.compiler.codfile.DataSection __dataSection)
-        throws IOException
-    {
-
+
+
+
+
+
+
+
+
+
+
-        _name = __dataSection.getDataBytes().get_identifier(__input.readUnsignedShort());
+        System.out.println("member " + _name.getString());
+
-        _typeListOffset = __input.readUnsignedShort();
-    }
-

src/net/rim/tools/compiler/codfile/Routine.java

@@ -225 +225 @@
-                    z_fIStringBuffer.append(super._typeList.get_baseType().getTypeName());
-                    z_fIStringBuffer.append(" ");
-                }
+                if (super._name.getString().length() == 0) {
+                    z_fIStringBuffer.append(super.get_Name());
+                } else {
-                z_fIStringBuffer.append(super._name.getString());
+                }
-                z_fIStringBuffer.append("( ");
-                int i = _protoTypeList.length();
-                for(int l = 0; l < i; l++)

src/net/rim/tools/compiler/exec/c.java

@@ -15 +15 @@
-
-public class c
-{
-
+_static
-    {
-
-        private static final int z_ifI = 4;
@@ -154 +154 @@
-            z_charDeflater.end();
-        }
-
-
+_static
-        {
-            z_gotoc$b = new net.rim.tools.compiler.exec.cls_c$b();
-            z_caseI = l;

src/net/rim/tools/compiler/types/ClassType.java

@@ -177 +177 @@
-
-    public void set_className(String s)
-    {
+        System.out.println("SET CLASS NAME TO " + s);
-        f_className_nv = s;
-    }
-