From: <cap...@us...> - 2007-03-16 15:33:15
|
Revision: 2 http://svn.sourceforge.net/pearcolator/?rev=2&view=rev Author: captain5050 Date: 2007-03-16 08:33:01 -0700 (Fri, 16 Mar 2007) Log Message: ----------- Restructure files and imports following Jikes RVM restructuring Modified Paths: -------------- src/org/binarytranslator/arch/ppc/decoder/PPC2IR.java src/org/binarytranslator/arch/ppc/decoder/PPC_InstructionDecoder.java src/org/binarytranslator/arch/ppc/decoder/PPC_Laziness.java src/org/binarytranslator/arch/ppc/os/process/PPC_ProcessSpace.java src/org/binarytranslator/arch/x86/decoder/X862IR.java src/org/binarytranslator/arch/x86/decoder/X86_DecodedOperand.java src/org/binarytranslator/arch/x86/decoder/X86_InstructionDecoder.java src/org/binarytranslator/arch/x86/os/process/X86_ProcessSpace.java src/org/binarytranslator/generic/decoder/DecoderUtils.java src/org/binarytranslator/generic/memory/CallBasedMemory.java src/org/binarytranslator/generic/memory/IntAddressedPreSwappedMemory.java src/org/binarytranslator/generic/memory/Memory.java src/org/binarytranslator/generic/os/process/ProcessSpace.java src/org/binarytranslator/vmInterface/DBT_ConvertBinaryToHIR.java src/org/binarytranslator/vmInterface/DBT_OptimizingCompilerException.java src/org/binarytranslator/vmInterface/DBT_Trace.java src/org/binarytranslator/vmInterface/DynamicCodeRunner.java src/org/binarytranslator/vmInterface/TranslationHelper.java Added Paths: ----------- LICENSE.txt ext/org/ ext/org/jikesrvm/ ext/org/jikesrvm/opt/ ext/org/jikesrvm/opt/ir/ ext/org/jikesrvm/opt/ir/OPT_HIRGenerator.java Removed Paths: ------------- LICENSE ext/com/ Deleted: LICENSE =================================================================== --- LICENSE 2006-12-07 14:54:50 UTC (rev 1) +++ LICENSE 2007-03-16 15:33:01 UTC (rev 2) @@ -1,247 +0,0 @@ - Common Public License - v 1.0 - - THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON - PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF - THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - - 1. DEFINITIONS - - "Contribution" means: - - a) in the case of the initial Contributor, the initial code and - documentation distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - - i) changes to the Program, and - - ii) additions to the Program; - - where such changes and/or additions to the Program originate from - and are distributed by that particular Contributor. A Contribution - 'originates' from a Contributor if it was added to the Program by - such Contributor itself or anyone acting on such Contributor's - behalf. Contributions do not include additions to the Program - which: (i) are separate modules of software distributed in - conjunction with the Program under their own license agreement, and - (ii) are not derivative works of the Program. - - "Contributor" means any person or entity that distributes the - Program. - - "Licensed Patents" mean patent claims licensable by a Contributor - which are necessarily infringed by the use or sale of its - Contribution alone or when combined with the Program. - - "Program" means the Contributions distributed in accordance with - this Agreement. - - "Recipient" means anyone who receives the Program under this - Agreement, including all Contributors. - - - 2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free - copyright license to reproduce, prepare derivative works of, - publicly display, publicly perform, distribute and sublicense - the Contribution of such Contributor, if any, and such - derivative works, in source code and object code form. - - b) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free - patent license under Licensed Patents to make, use, sell, offer - to sell, import and otherwise transfer the Contribution of such - Contributor, if any, in source code and object code form. This - patent license shall apply to the combination of the - Contribution and the Program if, at the time the Contribution - is added by the Contributor, such addition of the Contribution - causes such combination to be covered by the Licensed - Patents. The patent license shall not apply to any other - combinations which include the Contribution. No hardware per se - is licensed hereunder. - - c) Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances - are provided by any Contributor that the Program does not - infringe the patent or other intellectual property rights of - any other entity. Each Contributor disclaims any liability to - Recipient for claims brought by any other entity based on - infringement of intellectual property rights or otherwise. As - a condition to exercising the rights and licenses granted - hereunder, each Recipient hereby assumes sole responsibility to - secure any other intellectual property rights needed, if any. - For example, if a third party patent license is required to - allow Recipient to distribute the Program, it is Recipient's - responsibility to acquire that license before distributing the - Program. - - d) Each Contributor represents that to its knowledge it has - sufficient copyright rights in its Contribution, if any, to - grant the copyright license set forth in this Agreement. - - 3. REQUIREMENTS - - A Contributor may choose to distribute the Program in object code - form under its own license agreement, provided that: - - a) it complies with the terms and conditions of this Agreement; and - - b) its license agreement: - - i) effectively disclaims on behalf of all Contributors all - warranties and conditions, express and implied, including - warranties or conditions of title and non-infringement, and - implied warranties or conditions of merchantability and fitness - for a particular purpose; - - ii) effectively excludes on behalf of all Contributors all - liability for damages, including direct, indirect, special, - incidental and consequential damages, such as lost profits; - - iii) states that any provisions which differ from this Agreement - are offered by that Contributor alone and not by any other - party; and - - iv) states that source code for the Program is available from such - Contributor, and informs licensees how to obtain it in a - reasonable manner on or through a medium customarily used for - software exchange. - - When the Program is made available in source code form: - - a) it must be made available under this Agreement; and - - b) a copy of this Agreement must be included with each copy of the - Program. - - Contributors may not remove or alter any copyright notices - contained within the Program. - - Each Contributor must identify itself as the originator of its - Contribution, if any, in a manner that reasonably allows subsequent - Recipients to identify the originator of the Contribution. - - 4. COMMERCIAL DISTRIBUTION - - Commercial distributors of software may accept certain - responsibilities with respect to end users, business partners and - the like. While this license is intended to facilitate the - commercial use of the Program, the Contributor who includes the - Program in a commercial product offering should do so in a manner - which does not create potential liability for other - Contributors. Therefore, if a Contributor includes the Program in a - commercial product offering, such Contributor ("Commercial - Contributor") hereby agrees to defend and indemnify every other - Contributor ("Indemnified Contributor") against any losses, damages - and costs (collectively "Losses") arising from claims, lawsuits and - other legal actions brought by a third party against the - Indemnified Contributor to the extent caused by the acts or - omissions of such Commercial Contributor in connection with its - distribution of the Program in a commercial product offering. The - obligations in this section do not apply to any claims or Losses - relating to any actual or alleged intellectual property - infringement. In order to qualify, an Indemnified Contributor - must: a) promptly notify the Commercial Contributor in writing of - such claim, and b) allow the Commercial Contributor to control, and - cooperate with the Commercial Contributor in, the defense and any - related settlement negotiations. The Indemnified Contributor may - participate in any such claim at its own expense. - - For example, a Contributor might include the Program in a - commercial product offering, Product X. That Contributor is then a - Commercial Contributor. If that Commercial Contributor then makes - performance claims, or offers warranties related to Product X, - those performance claims and warranties are such Commercial - Contributor's responsibility alone. Under this section, the - Commercial Contributor would have to defend claims against the - other Contributors related to those performance claims and - warranties, and if a court requires any other Contributor to pay - any damages as a result, the Commercial Contributor must pay those - damages. - - 5. NO WARRANTY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS - PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF - ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, - ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, - MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each - Recipient is solely responsible for determining the appropriateness - of using and distributing the Program and assumes all risks - associated with its exercise of rights under this Agreement, - including but not limited to the risks and costs of program errors, - compliance with applicable laws, damage to or loss of data, - programs or equipment, and unavailability or interruption of - operations. - - 6. DISCLAIMER OF LIABILITY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT - NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF - THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY - RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGES. - - 7. GENERAL - - If any provision of this Agreement is invalid or unenforceable - under applicable law, it shall not affect the validity or - enforceability of the remainder of the terms of this Agreement, and - without further action by the parties hereto, such provision shall - be reformed to the minimum extent necessary to make such provision - valid and enforceable. - - If Recipient institutes patent litigation against a Contributor - with respect to a patent applicable to software (including a - cross-claim or counterclaim in a lawsuit), then any patent licenses - granted by that Contributor to such Recipient under this Agreement - shall terminate as of the date such litigation is filed. In - addition, if Recipient institutes patent litigation against any - entity (including a cross-claim or counterclaim in a lawsuit) - alleging that the Program itself (excluding combinations of the - Program with other software or hardware) infringes such Recipient's - patent(s), then such Recipient's rights granted under Section 2(b) - shall terminate as of the date such litigation is filed. - - All Recipient's rights under this Agreement shall terminate if it - fails to comply with any of the material terms or conditions of - this Agreement and does not cure such failure in a reasonable - period of time after becoming aware of such noncompliance. If all - Recipient's rights under this Agreement terminate, Recipient agrees - to cease use and distribution of the Program as soon as reasonably - practicable. However, Recipient's obligations under this Agreement - and any licenses granted by Recipient relating to the Program shall - continue and survive. - - Everyone is permitted to copy and distribute copies of this - Agreement, but in order to avoid inconsistency the Agreement is - copyrighted and may only be modified in the following manner. The - Agreement Steward reserves the right to publish new versions - (including revisions) of this Agreement from time to time. No one - other than the Agreement Steward has the right to modify this - Agreement. IBM is the initial Agreement Steward. IBM may assign - the responsibility to serve as the Agreement Steward to a suitable - separate entity. Each new version of the Agreement will be given a - distinguishing version number. The Program (including - Contributions) may always be distributed subject to the version of - the Agreement under which it was received. In addition, after a new - version of the Agreement is published, Contributor may elect to - distribute the Program (including its Contributions) under the new - version. Except as expressly stated in Sections 2(a) and 2(b) - above, Recipient receives no rights or licenses to the intellectual - property of any Contributor under this Agreement, whether - expressly, by implication, estoppel or otherwise. All rights in the - Program not expressly granted under this Agreement are reserved. - - This Agreement is governed by the laws of the State of New York and - the intellectual property laws of the United States of America. No - party to this Agreement will bring a legal action under this - Agreement more than one year after the cause of action arose. Each - party waives its rights to a jury trial in any resulting - litigation. Copied: LICENSE.txt (from rev 1, LICENSE) =================================================================== --- LICENSE.txt (rev 0) +++ LICENSE.txt 2007-03-16 15:33:01 UTC (rev 2) @@ -0,0 +1,247 @@ + Common Public License - v 1.0 + + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON + PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF + THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + + 1. DEFINITIONS + + "Contribution" means: + + a) in the case of the initial Contributor, the initial code and + documentation distributed under this Agreement, and + + b) in the case of each subsequent Contributor: + + i) changes to the Program, and + + ii) additions to the Program; + + where such changes and/or additions to the Program originate from + and are distributed by that particular Contributor. A Contribution + 'originates' from a Contributor if it was added to the Program by + such Contributor itself or anyone acting on such Contributor's + behalf. Contributions do not include additions to the Program + which: (i) are separate modules of software distributed in + conjunction with the Program under their own license agreement, and + (ii) are not derivative works of the Program. + + "Contributor" means any person or entity that distributes the + Program. + + "Licensed Patents" mean patent claims licensable by a Contributor + which are necessarily infringed by the use or sale of its + Contribution alone or when combined with the Program. + + "Program" means the Contributions distributed in accordance with + this Agreement. + + "Recipient" means anyone who receives the Program under this + Agreement, including all Contributors. + + + 2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free + copyright license to reproduce, prepare derivative works of, + publicly display, publicly perform, distribute and sublicense + the Contribution of such Contributor, if any, and such + derivative works, in source code and object code form. + + b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free + patent license under Licensed Patents to make, use, sell, offer + to sell, import and otherwise transfer the Contribution of such + Contributor, if any, in source code and object code form. This + patent license shall apply to the combination of the + Contribution and the Program if, at the time the Contribution + is added by the Contributor, such addition of the Contribution + causes such combination to be covered by the Licensed + Patents. The patent license shall not apply to any other + combinations which include the Contribution. No hardware per se + is licensed hereunder. + + c) Recipient understands that although each Contributor grants the + licenses to its Contributions set forth herein, no assurances + are provided by any Contributor that the Program does not + infringe the patent or other intellectual property rights of + any other entity. Each Contributor disclaims any liability to + Recipient for claims brought by any other entity based on + infringement of intellectual property rights or otherwise. As + a condition to exercising the rights and licenses granted + hereunder, each Recipient hereby assumes sole responsibility to + secure any other intellectual property rights needed, if any. + For example, if a third party patent license is required to + allow Recipient to distribute the Program, it is Recipient's + responsibility to acquire that license before distributing the + Program. + + d) Each Contributor represents that to its knowledge it has + sufficient copyright rights in its Contribution, if any, to + grant the copyright license set forth in this Agreement. + + 3. REQUIREMENTS + + A Contributor may choose to distribute the Program in object code + form under its own license agreement, provided that: + + a) it complies with the terms and conditions of this Agreement; and + + b) its license agreement: + + i) effectively disclaims on behalf of all Contributors all + warranties and conditions, express and implied, including + warranties or conditions of title and non-infringement, and + implied warranties or conditions of merchantability and fitness + for a particular purpose; + + ii) effectively excludes on behalf of all Contributors all + liability for damages, including direct, indirect, special, + incidental and consequential damages, such as lost profits; + + iii) states that any provisions which differ from this Agreement + are offered by that Contributor alone and not by any other + party; and + + iv) states that source code for the Program is available from such + Contributor, and informs licensees how to obtain it in a + reasonable manner on or through a medium customarily used for + software exchange. + + When the Program is made available in source code form: + + a) it must be made available under this Agreement; and + + b) a copy of this Agreement must be included with each copy of the + Program. + + Contributors may not remove or alter any copyright notices + contained within the Program. + + Each Contributor must identify itself as the originator of its + Contribution, if any, in a manner that reasonably allows subsequent + Recipients to identify the originator of the Contribution. + + 4. COMMERCIAL DISTRIBUTION + + Commercial distributors of software may accept certain + responsibilities with respect to end users, business partners and + the like. While this license is intended to facilitate the + commercial use of the Program, the Contributor who includes the + Program in a commercial product offering should do so in a manner + which does not create potential liability for other + Contributors. Therefore, if a Contributor includes the Program in a + commercial product offering, such Contributor ("Commercial + Contributor") hereby agrees to defend and indemnify every other + Contributor ("Indemnified Contributor") against any losses, damages + and costs (collectively "Losses") arising from claims, lawsuits and + other legal actions brought by a third party against the + Indemnified Contributor to the extent caused by the acts or + omissions of such Commercial Contributor in connection with its + distribution of the Program in a commercial product offering. The + obligations in this section do not apply to any claims or Losses + relating to any actual or alleged intellectual property + infringement. In order to qualify, an Indemnified Contributor + must: a) promptly notify the Commercial Contributor in writing of + such claim, and b) allow the Commercial Contributor to control, and + cooperate with the Commercial Contributor in, the defense and any + related settlement negotiations. The Indemnified Contributor may + participate in any such claim at its own expense. + + For example, a Contributor might include the Program in a + commercial product offering, Product X. That Contributor is then a + Commercial Contributor. If that Commercial Contributor then makes + performance claims, or offers warranties related to Product X, + those performance claims and warranties are such Commercial + Contributor's responsibility alone. Under this section, the + Commercial Contributor would have to defend claims against the + other Contributors related to those performance claims and + warranties, and if a court requires any other Contributor to pay + any damages as a result, the Commercial Contributor must pay those + damages. + + 5. NO WARRANTY + + EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS + PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF + ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, + ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, + MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each + Recipient is solely responsible for determining the appropriateness + of using and distributing the Program and assumes all risks + associated with its exercise of rights under this Agreement, + including but not limited to the risks and costs of program errors, + compliance with applicable laws, damage to or loss of data, + programs or equipment, and unavailability or interruption of + operations. + + 6. DISCLAIMER OF LIABILITY + + EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT + NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY + RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGES. + + 7. GENERAL + + If any provision of this Agreement is invalid or unenforceable + under applicable law, it shall not affect the validity or + enforceability of the remainder of the terms of this Agreement, and + without further action by the parties hereto, such provision shall + be reformed to the minimum extent necessary to make such provision + valid and enforceable. + + If Recipient institutes patent litigation against a Contributor + with respect to a patent applicable to software (including a + cross-claim or counterclaim in a lawsuit), then any patent licenses + granted by that Contributor to such Recipient under this Agreement + shall terminate as of the date such litigation is filed. In + addition, if Recipient institutes patent litigation against any + entity (including a cross-claim or counterclaim in a lawsuit) + alleging that the Program itself (excluding combinations of the + Program with other software or hardware) infringes such Recipient's + patent(s), then such Recipient's rights granted under Section 2(b) + shall terminate as of the date such litigation is filed. + + All Recipient's rights under this Agreement shall terminate if it + fails to comply with any of the material terms or conditions of + this Agreement and does not cure such failure in a reasonable + period of time after becoming aware of such noncompliance. If all + Recipient's rights under this Agreement terminate, Recipient agrees + to cease use and distribution of the Program as soon as reasonably + practicable. However, Recipient's obligations under this Agreement + and any licenses granted by Recipient relating to the Program shall + continue and survive. + + Everyone is permitted to copy and distribute copies of this + Agreement, but in order to avoid inconsistency the Agreement is + copyrighted and may only be modified in the following manner. The + Agreement Steward reserves the right to publish new versions + (including revisions) of this Agreement from time to time. No one + other than the Agreement Steward has the right to modify this + Agreement. IBM is the initial Agreement Steward. IBM may assign + the responsibility to serve as the Agreement Steward to a suitable + separate entity. Each new version of the Agreement will be given a + distinguishing version number. The Program (including + Contributions) may always be distributed subject to the version of + the Agreement under which it was received. In addition, after a new + version of the Agreement is published, Contributor may elect to + distribute the Program (including its Contributions) under the new + version. Except as expressly stated in Sections 2(a) and 2(b) + above, Recipient receives no rights or licenses to the intellectual + property of any Contributor under this Agreement, whether + expressly, by implication, estoppel or otherwise. All rights in the + Program not expressly granted under this Agreement are reserved. + + This Agreement is governed by the laws of the State of New York and + the intellectual property laws of the United States of America. No + party to this Agreement will bring a legal action under this + Agreement more than one year after the cause of action arose. Each + party waives its rights to a jury trial in any resulting + litigation. Copied: ext/org/jikesrvm/opt/ir/OPT_HIRGenerator.java (from rev 1, ext/com/ibm/jikesrvm/opt/ir/OPT_HIRGenerator.java) =================================================================== --- ext/org/jikesrvm/opt/ir/OPT_HIRGenerator.java (rev 0) +++ ext/org/jikesrvm/opt/ir/OPT_HIRGenerator.java 2007-03-16 15:33:01 UTC (rev 2) @@ -0,0 +1,15 @@ +/* + * (C) The University of Manchester 2003 - 2006 + */ +package org.jikesrvm.opt.ir; + +/** + * Interface implemented by all optimizing compiler HIR generators + * such as OPT_BC2HIR and DBT_HIRGenerator + */ +public interface OPT_HIRGenerator { + /** + * Method to create the HIR + */ + public void generateHIR(); +} Modified: src/org/binarytranslator/arch/ppc/decoder/PPC2IR.java =================================================================== --- src/org/binarytranslator/arch/ppc/decoder/PPC2IR.java 2006-12-07 14:54:50 UTC (rev 1) +++ src/org/binarytranslator/arch/ppc/decoder/PPC2IR.java 2007-03-16 15:33:01 UTC (rev 2) @@ -16,53 +16,53 @@ import org.binarytranslator.generic.decoder.DecoderUtils; import org.binarytranslator.generic.decoder.Laziness; // General VM class -import com.ibm.jikesrvm.VM; +import org.jikesrvm.VM; // Classes to get at class types -import com.ibm.jikesrvm.classloader.VM_Class; -import com.ibm.jikesrvm.classloader.VM_Method; -import com.ibm.jikesrvm.classloader.VM_TypeReference; -import com.ibm.jikesrvm.classloader.VM_MethodReference; -import com.ibm.jikesrvm.classloader.VM_MemberReference; -import com.ibm.jikesrvm.classloader.VM_FieldReference; -import com.ibm.jikesrvm.classloader.VM_BootstrapClassLoader; -import com.ibm.jikesrvm.classloader.VM_Atom; +import org.jikesrvm.classloader.VM_Class; +import org.jikesrvm.classloader.VM_Method; +import org.jikesrvm.classloader.VM_TypeReference; +import org.jikesrvm.classloader.VM_MethodReference; +import org.jikesrvm.classloader.VM_MemberReference; +import org.jikesrvm.classloader.VM_FieldReference; +import org.jikesrvm.classloader.VM_BootstrapClassLoader; +import org.jikesrvm.classloader.VM_Atom; // OPT interface -import com.ibm.jikesrvm.opt.OPT_Constants; -import com.ibm.jikesrvm.opt.ir.OPT_GenerationContext; -import com.ibm.jikesrvm.opt.ir.OPT_HIRGenerator; -import com.ibm.jikesrvm.opt.ir.OPT_IR; +import org.jikesrvm.opt.OPT_Constants; +import org.jikesrvm.opt.ir.OPT_GenerationContext; +import org.jikesrvm.opt.ir.OPT_HIRGenerator; +import org.jikesrvm.opt.ir.OPT_IR; // Instructions -import com.ibm.jikesrvm.opt.ir.OPT_Instruction; -import com.ibm.jikesrvm.opt.ir.OPT_Operator; -import com.ibm.jikesrvm.opt.ir.OPT_Operators; -import com.ibm.jikesrvm.opt.ir.Athrow; -import com.ibm.jikesrvm.opt.ir.Binary; -import com.ibm.jikesrvm.opt.ir.BBend; -import com.ibm.jikesrvm.opt.ir.BooleanCmp; -import com.ibm.jikesrvm.opt.ir.Call; -import com.ibm.jikesrvm.opt.ir.CondMove; -import com.ibm.jikesrvm.opt.ir.GetField; -import com.ibm.jikesrvm.opt.ir.Goto; -import com.ibm.jikesrvm.opt.ir.IfCmp; -import com.ibm.jikesrvm.opt.ir.Move; -import com.ibm.jikesrvm.opt.ir.New; -import com.ibm.jikesrvm.opt.ir.LookupSwitch; -import com.ibm.jikesrvm.opt.ir.PutField; -import com.ibm.jikesrvm.opt.ir.Unary; +import org.jikesrvm.opt.ir.OPT_Instruction; +import org.jikesrvm.opt.ir.OPT_Operator; +import org.jikesrvm.opt.ir.OPT_Operators; +import org.jikesrvm.opt.ir.Athrow; +import org.jikesrvm.opt.ir.Binary; +import org.jikesrvm.opt.ir.BBend; +import org.jikesrvm.opt.ir.BooleanCmp; +import org.jikesrvm.opt.ir.Call; +import org.jikesrvm.opt.ir.CondMove; +import org.jikesrvm.opt.ir.GetField; +import org.jikesrvm.opt.ir.Goto; +import org.jikesrvm.opt.ir.IfCmp; +import org.jikesrvm.opt.ir.Move; +import org.jikesrvm.opt.ir.New; +import org.jikesrvm.opt.ir.LookupSwitch; +import org.jikesrvm.opt.ir.PutField; +import org.jikesrvm.opt.ir.Unary; // Operands -import com.ibm.jikesrvm.opt.ir.OPT_AddressConstantOperand; -import com.ibm.jikesrvm.opt.ir.OPT_BasicBlock; -import com.ibm.jikesrvm.opt.ir.OPT_BranchOperand; -import com.ibm.jikesrvm.opt.ir.OPT_BranchProfileOperand; -import com.ibm.jikesrvm.opt.ir.OPT_ConditionOperand; -import com.ibm.jikesrvm.opt.ir.OPT_IntConstantOperand; -import com.ibm.jikesrvm.opt.ir.OPT_LocationOperand; -import com.ibm.jikesrvm.opt.ir.OPT_MethodOperand; -import com.ibm.jikesrvm.opt.ir.OPT_Operand; -import com.ibm.jikesrvm.opt.ir.OPT_Register; -import com.ibm.jikesrvm.opt.ir.OPT_RegisterOperand; -import com.ibm.jikesrvm.opt.ir.OPT_TrueGuardOperand; -import com.ibm.jikesrvm.opt.ir.OPT_TypeOperand; +import org.jikesrvm.opt.ir.OPT_AddressConstantOperand; +import org.jikesrvm.opt.ir.OPT_BasicBlock; +import org.jikesrvm.opt.ir.OPT_BranchOperand; +import org.jikesrvm.opt.ir.OPT_BranchProfileOperand; +import org.jikesrvm.opt.ir.OPT_ConditionOperand; +import org.jikesrvm.opt.ir.OPT_IntConstantOperand; +import org.jikesrvm.opt.ir.OPT_LocationOperand; +import org.jikesrvm.opt.ir.OPT_MethodOperand; +import org.jikesrvm.opt.ir.OPT_Operand; +import org.jikesrvm.opt.ir.OPT_Register; +import org.jikesrvm.opt.ir.OPT_RegisterOperand; +import org.jikesrvm.opt.ir.OPT_TrueGuardOperand; +import org.jikesrvm.opt.ir.OPT_TypeOperand; // Java utilities import java.util.Enumeration; import java.util.NoSuchElementException; Modified: src/org/binarytranslator/arch/ppc/decoder/PPC_InstructionDecoder.java =================================================================== --- src/org/binarytranslator/arch/ppc/decoder/PPC_InstructionDecoder.java 2006-12-07 14:54:50 UTC (rev 1) +++ src/org/binarytranslator/arch/ppc/decoder/PPC_InstructionDecoder.java 2007-03-16 15:33:01 UTC (rev 2) @@ -14,10 +14,10 @@ import org.binarytranslator.generic.fault.BadInstructionException; import org.binarytranslator.generic.decoder.InstructionDecoder; -import com.ibm.jikesrvm.opt.ir.*; -import com.ibm.jikesrvm.*; -import com.ibm.jikesrvm.classloader.*; -import com.ibm.jikesrvm.opt.*; +import org.jikesrvm.opt.ir.*; +import org.jikesrvm.*; +import org.jikesrvm.classloader.*; +import org.jikesrvm.opt.*; import java.util.Enumeration; import java.util.NoSuchElementException; Modified: src/org/binarytranslator/arch/ppc/decoder/PPC_Laziness.java =================================================================== --- src/org/binarytranslator/arch/ppc/decoder/PPC_Laziness.java 2006-12-07 14:54:50 UTC (rev 1) +++ src/org/binarytranslator/arch/ppc/decoder/PPC_Laziness.java 2007-03-16 15:33:01 UTC (rev 2) @@ -10,8 +10,6 @@ import org.binarytranslator.generic.decoder.Laziness; -import com.ibm.jikesrvm.VM; - /** * A representation of the lazy state. This and a PC address define * what a block of code is good for. We don't use lazy evaluation for Modified: src/org/binarytranslator/arch/ppc/os/process/PPC_ProcessSpace.java =================================================================== --- src/org/binarytranslator/arch/ppc/os/process/PPC_ProcessSpace.java 2006-12-07 14:54:50 UTC (rev 1) +++ src/org/binarytranslator/arch/ppc/os/process/PPC_ProcessSpace.java 2007-03-16 15:33:01 UTC (rev 2) @@ -8,8 +8,8 @@ */ package org.binarytranslator.arch.ppc.os.process; -import com.ibm.jikesrvm.opt.ir.OPT_GenerationContext; -import com.ibm.jikesrvm.opt.ir.OPT_HIRGenerator; +import org.jikesrvm.opt.ir.OPT_GenerationContext; +import org.jikesrvm.opt.ir.OPT_HIRGenerator; import org.binarytranslator.DBT_Options; import org.binarytranslator.arch.ppc.os.process.linux.PPC_LinuxProcessSpace; import org.binarytranslator.arch.ppc.decoder.PPC2IR; Modified: src/org/binarytranslator/arch/x86/decoder/X862IR.java =================================================================== --- src/org/binarytranslator/arch/x86/decoder/X862IR.java 2006-12-07 14:54:50 UTC (rev 1) +++ src/org/binarytranslator/arch/x86/decoder/X862IR.java 2007-03-16 15:33:01 UTC (rev 2) @@ -21,59 +21,59 @@ import org.binarytranslator.generic.decoder.DecoderUtils; import org.binarytranslator.generic.decoder.Laziness; -import com.ibm.jikesrvm.opt.ir.OPT_HIRGenerator; -import com.ibm.jikesrvm.classloader.VM_TypeReference; -import com.ibm.jikesrvm.classloader.VM_Atom; +import org.jikesrvm.opt.ir.OPT_HIRGenerator; +import org.jikesrvm.classloader.VM_TypeReference; +import org.jikesrvm.classloader.VM_Atom; // General VM class -import com.ibm.jikesrvm.VM; +import org.jikesrvm.VM; // Classes to get at class types -import com.ibm.jikesrvm.classloader.VM_Class; -import com.ibm.jikesrvm.classloader.VM_Method; -import com.ibm.jikesrvm.classloader.VM_TypeReference; -import com.ibm.jikesrvm.classloader.VM_MethodReference; -import com.ibm.jikesrvm.classloader.VM_MemberReference; -import com.ibm.jikesrvm.classloader.VM_FieldReference; -import com.ibm.jikesrvm.classloader.VM_BootstrapClassLoader; -import com.ibm.jikesrvm.classloader.VM_Atom; +import org.jikesrvm.classloader.VM_Class; +import org.jikesrvm.classloader.VM_Method; +import org.jikesrvm.classloader.VM_TypeReference; +import org.jikesrvm.classloader.VM_MethodReference; +import org.jikesrvm.classloader.VM_MemberReference; +import org.jikesrvm.classloader.VM_FieldReference; +import org.jikesrvm.classloader.VM_BootstrapClassLoader; +import org.jikesrvm.classloader.VM_Atom; // OPT interface -import com.ibm.jikesrvm.opt.OPT_Constants; -import com.ibm.jikesrvm.opt.ir.OPT_GenerationContext; -import com.ibm.jikesrvm.opt.ir.OPT_HIRGenerator; -import com.ibm.jikesrvm.opt.ir.OPT_IR; -import com.ibm.jikesrvm.opt.ir.OPT_BasicBlock; +import org.jikesrvm.opt.OPT_Constants; +import org.jikesrvm.opt.ir.OPT_GenerationContext; +import org.jikesrvm.opt.ir.OPT_HIRGenerator; +import org.jikesrvm.opt.ir.OPT_IR; +import org.jikesrvm.opt.ir.OPT_BasicBlock; // Instructions -import com.ibm.jikesrvm.opt.ir.OPT_Instruction; -import com.ibm.jikesrvm.opt.ir.OPT_Operator; -import com.ibm.jikesrvm.opt.ir.OPT_Operators; -import com.ibm.jikesrvm.opt.ir.ALoad; -import com.ibm.jikesrvm.opt.ir.AStore; -import com.ibm.jikesrvm.opt.ir.Athrow; -import com.ibm.jikesrvm.opt.ir.Binary; -import com.ibm.jikesrvm.opt.ir.BBend; -import com.ibm.jikesrvm.opt.ir.Call; -import com.ibm.jikesrvm.opt.ir.CondMove; -import com.ibm.jikesrvm.opt.ir.GetField; -import com.ibm.jikesrvm.opt.ir.Goto; -import com.ibm.jikesrvm.opt.ir.IfCmp; -import com.ibm.jikesrvm.opt.ir.Move; -import com.ibm.jikesrvm.opt.ir.New; -import com.ibm.jikesrvm.opt.ir.LookupSwitch; -import com.ibm.jikesrvm.opt.ir.PutField; -import com.ibm.jikesrvm.opt.ir.Unary; +import org.jikesrvm.opt.ir.OPT_Instruction; +import org.jikesrvm.opt.ir.OPT_Operator; +import org.jikesrvm.opt.ir.OPT_Operators; +import org.jikesrvm.opt.ir.ALoad; +import org.jikesrvm.opt.ir.AStore; +import org.jikesrvm.opt.ir.Athrow; +import org.jikesrvm.opt.ir.Binary; +import org.jikesrvm.opt.ir.BBend; +import org.jikesrvm.opt.ir.Call; +import org.jikesrvm.opt.ir.CondMove; +import org.jikesrvm.opt.ir.GetField; +import org.jikesrvm.opt.ir.Goto; +import org.jikesrvm.opt.ir.IfCmp; +import org.jikesrvm.opt.ir.Move; +import org.jikesrvm.opt.ir.New; +import org.jikesrvm.opt.ir.LookupSwitch; +import org.jikesrvm.opt.ir.PutField; +import org.jikesrvm.opt.ir.Unary; // Operands -import com.ibm.jikesrvm.opt.ir.OPT_AddressConstantOperand; -import com.ibm.jikesrvm.opt.ir.OPT_BranchOperand; -import com.ibm.jikesrvm.opt.ir.OPT_BranchProfileOperand; -import com.ibm.jikesrvm.opt.ir.OPT_ConditionOperand; -import com.ibm.jikesrvm.opt.ir.OPT_IntConstantOperand; -import com.ibm.jikesrvm.opt.ir.OPT_LocationOperand; -import com.ibm.jikesrvm.opt.ir.OPT_MethodOperand; -import com.ibm.jikesrvm.opt.ir.OPT_Operand; -import com.ibm.jikesrvm.opt.ir.OPT_Register; -import com.ibm.jikesrvm.opt.ir.OPT_RegisterOperand; -import com.ibm.jikesrvm.opt.ir.OPT_TrueGuardOperand; -import com.ibm.jikesrvm.opt.ir.OPT_TypeOperand; +import org.jikesrvm.opt.ir.OPT_AddressConstantOperand; +import org.jikesrvm.opt.ir.OPT_BranchOperand; +import org.jikesrvm.opt.ir.OPT_BranchProfileOperand; +import org.jikesrvm.opt.ir.OPT_ConditionOperand; +import org.jikesrvm.opt.ir.OPT_IntConstantOperand; +import org.jikesrvm.opt.ir.OPT_LocationOperand; +import org.jikesrvm.opt.ir.OPT_MethodOperand; +import org.jikesrvm.opt.ir.OPT_Operand; +import org.jikesrvm.opt.ir.OPT_Register; +import org.jikesrvm.opt.ir.OPT_RegisterOperand; +import org.jikesrvm.opt.ir.OPT_TrueGuardOperand; +import org.jikesrvm.opt.ir.OPT_TypeOperand; public class X862IR extends DecoderUtils implements OPT_HIRGenerator, OPT_Operators, OPT_Constants { Modified: src/org/binarytranslator/arch/x86/decoder/X86_DecodedOperand.java =================================================================== --- src/org/binarytranslator/arch/x86/decoder/X86_DecodedOperand.java 2006-12-07 14:54:50 UTC (rev 1) +++ src/org/binarytranslator/arch/x86/decoder/X86_DecodedOperand.java 2007-03-16 15:33:01 UTC (rev 2) @@ -12,13 +12,13 @@ import org.binarytranslator.arch.x86.os.process.X86_Registers; -import com.ibm.jikesrvm.opt.ir.OPT_Operators; -import com.ibm.jikesrvm.opt.ir.Binary; -import com.ibm.jikesrvm.opt.ir.Move; +import org.jikesrvm.opt.ir.OPT_Operators; +import org.jikesrvm.opt.ir.Binary; +import org.jikesrvm.opt.ir.Move; -import com.ibm.jikesrvm.opt.ir.OPT_Operand; -import com.ibm.jikesrvm.opt.ir.OPT_IntConstantOperand; -import com.ibm.jikesrvm.opt.ir.OPT_RegisterOperand; +import org.jikesrvm.opt.ir.OPT_Operand; +import org.jikesrvm.opt.ir.OPT_IntConstantOperand; +import org.jikesrvm.opt.ir.OPT_RegisterOperand; /** * Wrapper for X86 decoded operands that are either in memory, Modified: src/org/binarytranslator/arch/x86/decoder/X86_InstructionDecoder.java =================================================================== --- src/org/binarytranslator/arch/x86/decoder/X86_InstructionDecoder.java 2006-12-07 14:54:50 UTC (rev 1) +++ src/org/binarytranslator/arch/x86/decoder/X86_InstructionDecoder.java 2007-03-16 15:33:01 UTC (rev 2) @@ -19,29 +19,29 @@ import org.binarytranslator.arch.x86.os.process.X86_ProcessSpace; import org.binarytranslator.arch.x86.os.process.X86_Registers; -import com.ibm.jikesrvm.classloader.VM_TypeReference; +import org.jikesrvm.classloader.VM_TypeReference; -import com.ibm.jikesrvm.opt.ir.Binary; -import com.ibm.jikesrvm.opt.ir.BooleanCmp; -import com.ibm.jikesrvm.opt.ir.BooleanCmp2; -import com.ibm.jikesrvm.opt.ir.CondMove; -import com.ibm.jikesrvm.opt.ir.IfCmp; -import com.ibm.jikesrvm.opt.ir.Goto; -import com.ibm.jikesrvm.opt.ir.Move; -import com.ibm.jikesrvm.opt.ir.Unary; +import org.jikesrvm.opt.ir.Binary; +import org.jikesrvm.opt.ir.BooleanCmp; +import org.jikesrvm.opt.ir.BooleanCmp2; +import org.jikesrvm.opt.ir.CondMove; +import org.jikesrvm.opt.ir.IfCmp; +import org.jikesrvm.opt.ir.Goto; +import org.jikesrvm.opt.ir.Move; +import org.jikesrvm.opt.ir.Unary; -import com.ibm.jikesrvm.opt.ir.OPT_Operator; -import com.ibm.jikesrvm.opt.ir.OPT_Operators; +import org.jikesrvm.opt.ir.OPT_Operator; +import org.jikesrvm.opt.ir.OPT_Operators; -import com.ibm.jikesrvm.opt.ir.OPT_BasicBlock; -import com.ibm.jikesrvm.opt.ir.OPT_Instruction; +import org.jikesrvm.opt.ir.OPT_BasicBlock; +import org.jikesrvm.opt.ir.OPT_Instruction; -import com.ibm.jikesrvm.opt.ir.OPT_Operand; -import com.ibm.jikesrvm.opt.ir.OPT_BranchOperand; -import com.ibm.jikesrvm.opt.ir.OPT_BranchProfileOperand; -import com.ibm.jikesrvm.opt.ir.OPT_ConditionOperand; -import com.ibm.jikesrvm.opt.ir.OPT_IntConstantOperand; -import com.ibm.jikesrvm.opt.ir.OPT_RegisterOperand; +import org.jikesrvm.opt.ir.OPT_Operand; +import org.jikesrvm.opt.ir.OPT_BranchOperand; +import org.jikesrvm.opt.ir.OPT_BranchProfileOperand; +import org.jikesrvm.opt.ir.OPT_ConditionOperand; +import org.jikesrvm.opt.ir.OPT_IntConstantOperand; +import org.jikesrvm.opt.ir.OPT_RegisterOperand; /** * Decoder for X86 instructions Modified: src/org/binarytranslator/arch/x86/os/process/X86_ProcessSpace.java =================================================================== --- src/org/binarytranslator/arch/x86/os/process/X86_ProcessSpace.java 2006-12-07 14:54:50 UTC (rev 1) +++ src/org/binarytranslator/arch/x86/os/process/X86_ProcessSpace.java 2007-03-16 15:33:01 UTC (rev 2) @@ -10,8 +10,8 @@ import java.io.*; -import com.ibm.jikesrvm.opt.ir.OPT_GenerationContext; -import com.ibm.jikesrvm.opt.ir.OPT_HIRGenerator; +import org.jikesrvm.opt.ir.OPT_GenerationContext; +import org.jikesrvm.opt.ir.OPT_HIRGenerator; import org.binarytranslator.DBT_Options; import org.binarytranslator.generic.os.process.ProcessSpace; Modified: src/org/binarytranslator/generic/decoder/DecoderUtils.java =================================================================== --- src/org/binarytranslator/generic/decoder/DecoderUtils.java 2006-12-07 14:54:50 UTC (rev 1) +++ src/org/binarytranslator/generic/decoder/DecoderUtils.java 2007-03-16 15:33:01 UTC (rev 2) @@ -19,48 +19,48 @@ import org.binarytranslator.generic.os.process.ProcessSpace; import org.binarytranslator.DBT_Options; -import com.ibm.jikesrvm.VM; +import org.jikesrvm.VM; -import com.ibm.jikesrvm.classloader.VM_Atom; -import com.ibm.jikesrvm.classloader.VM_BootstrapClassLoader; -import com.ibm.jikesrvm.classloader.VM_Class; -import com.ibm.jikesrvm.classloader.VM_MemberReference; -import com.ibm.jikesrvm.classloader.VM_Method; -import com.ibm.jikesrvm.classloader.VM_MethodReference; -import com.ibm.jikesrvm.classloader.VM_TypeReference; +import org.jikesrvm.classloader.VM_Atom; +import org.jikesrvm.classloader.VM_BootstrapClassLoader; +import org.jikesrvm.classloader.VM_Class; +import org.jikesrvm.classloader.VM_MemberReference; +import org.jikesrvm.classloader.VM_Method; +import org.jikesrvm.classloader.VM_MethodReference; +import org.jikesrvm.classloader.VM_TypeReference; -import com.ibm.jikesrvm.opt.OPT_Constants; -import com.ibm.jikesrvm.opt.ir.OPT_GenerationContext; -import com.ibm.jikesrvm.opt.ir.OPT_HIRGenerator; -import com.ibm.jikesrvm.opt.ir.OPT_IR; -import com.ibm.jikesrvm.opt.ir.OPT_BasicBlock; +import org.jikesrvm.opt.OPT_Constants; +import org.jikesrvm.opt.ir.OPT_GenerationContext; +import org.jikesrvm.opt.ir.OPT_HIRGenerator; +import org.jikesrvm.opt.ir.OPT_IR; +import org.jikesrvm.opt.ir.OPT_BasicBlock; -import com.ibm.jikesrvm.opt.ir.OPT_Instruction; -import com.ibm.jikesrvm.opt.ir.OPT_Operators; -import com.ibm.jikesrvm.opt.ir.OPT_Operator; -import com.ibm.jikesrvm.opt.ir.Athrow; -import com.ibm.jikesrvm.opt.ir.BBend; -import com.ibm.jikesrvm.opt.ir.Call; -import com.ibm.jikesrvm.opt.ir.CondMove; -import com.ibm.jikesrvm.opt.ir.Goto; -import com.ibm.jikesrvm.opt.ir.GetField; -import com.ibm.jikesrvm.opt.ir.IfCmp; -import com.ibm.jikesrvm.opt.ir.LookupSwitch; -import com.ibm.jikesrvm.opt.ir.Move; -import com.ibm.jikesrvm.opt.ir.New; -import com.ibm.jikesrvm.opt.ir.PutField; +import org.jikesrvm.opt.ir.OPT_Instruction; +import org.jikesrvm.opt.ir.OPT_Operators; +import org.jikesrvm.opt.ir.OPT_Operator; +import org.jikesrvm.opt.ir.Athrow; +import org.jikesrvm.opt.ir.BBend; +import org.jikesrvm.opt.ir.Call; +import org.jikesrvm.opt.ir.CondMove; +import org.jikesrvm.opt.ir.Goto; +import org.jikesrvm.opt.ir.GetField; +import org.jikesrvm.opt.ir.IfCmp; +import org.jikesrvm.opt.ir.LookupSwitch; +import org.jikesrvm.opt.ir.Move; +import org.jikesrvm.opt.ir.New; +import org.jikesrvm.opt.ir.PutField; -import com.ibm.jikesrvm.opt.ir.OPT_Operand; -import com.ibm.jikesrvm.opt.ir.OPT_AddressConstantOperand; -import com.ibm.jikesrvm.opt.ir.OPT_BranchOperand; -import com.ibm.jikesrvm.opt.ir.OPT_BranchProfileOperand; -import com.ibm.jikesrvm.opt.ir.OPT_ConditionOperand; -import com.ibm.jikesrvm.opt.ir.OPT_IntConstantOperand; -import com.ibm.jikesrvm.opt.ir.OPT_MethodOperand; -import com.ibm.jikesrvm.opt.ir.OPT_Register; -import com.ibm.jikesrvm.opt.ir.OPT_RegisterOperand; -import com.ibm.jikesrvm.opt.ir.OPT_TrueGuardOperand; -import com.ibm.jikesrvm.opt.ir.OPT_TypeOperand; +import org.jikesrvm.opt.ir.OPT_Operand; +import org.jikesrvm.opt.ir.OPT_AddressConstantOperand; +import org.jikesrvm.opt.ir.OPT_BranchOperand; +import org.jikesrvm.opt.ir.OPT_BranchProfileOperand; +import org.jikesrvm.opt.ir.OPT_ConditionOperand; +import org.jikesrvm.opt.ir.OPT_IntConstantOperand; +import org.jikesrvm.opt.ir.OPT_MethodOperand; +import org.jikesrvm.opt.ir.OPT_Register; +import org.jikesrvm.opt.ir.OPT_RegisterOperand; +import org.jikesrvm.opt.ir.OPT_TrueGuardOperand; +import org.jikesrvm.opt.ir.OPT_TypeOperand; /** * A collection of common tools used by decoders. The public entry Modified: src/org/binarytranslator/generic/memory/CallBasedMemory.java =================================================================== --- src/org/binarytranslator/generic/memory/CallBasedMemory.java 2006-12-07 14:54:50 UTC (rev 1) +++ src/org/binarytranslator/generic/memory/CallBasedMemory.java 2007-03-16 15:33:01 UTC (rev 2) @@ -8,26 +8,26 @@ */ package org.binarytranslator.generic.memory; -import com.ibm.jikesrvm.VM; -import com.ibm.jikesrvm.classloader.VM_Atom; -import com.ibm.jikesrvm.classloader.VM_BootstrapClassLoader; -import com.ibm.jikesrvm.classloader.VM_FieldReference; -import com.ibm.jikesrvm.classloader.VM_MemberReference; -import com.ibm.jikesrvm.classloader.VM_Method; -import com.ibm.jikesrvm.classloader.VM_MethodReference; -import com.ibm.jikesrvm.classloader.VM_TypeReference; -import com.ibm.jikesrvm.opt.ir.Call; -import com.ibm.jikesrvm.opt.ir.GetField; -import com.ibm.jikesrvm.opt.ir.Unary; -import com.ibm.jikesrvm.opt.ir.OPT_AddressConstantOperand; -import com.ibm.jikesrvm.opt.ir.OPT_GenerationContext; -import com.ibm.jikesrvm.opt.ir.OPT_Instruction; -import com.ibm.jikesrvm.opt.ir.OPT_LocationOperand; -import com.ibm.jikesrvm.opt.ir.OPT_MethodOperand; -import com.ibm.jikesrvm.opt.ir.OPT_Operators; -import com.ibm.jikesrvm.opt.ir.OPT_Register; -import com.ibm.jikesrvm.opt.ir.OPT_RegisterOperand; -import com.ibm.jikesrvm.opt.ir.OPT_TrueGuardOperand; +import org.jikesrvm.VM; +import org.jikesrvm.classloader.VM_Atom; +import org.jikesrvm.classloader.VM_BootstrapClassLoader; +import org.jikesrvm.classloader.VM_FieldReference; +import org.jikesrvm.classloader.VM_MemberReference; +import org.jikesrvm.classloader.VM_Method; +import org.jikesrvm.classloader.VM_MethodReference; +import org.jikesrvm.classloader.VM_TypeReference; +import org.jikesrvm.opt.ir.Call; +import org.jikesrvm.opt.ir.GetField; +import org.jikesrvm.opt.ir.Unary; +import org.jikesrvm.opt.ir.OPT_AddressConstantOperand; +import org.jikesrvm.opt.ir.OPT_GenerationContext; +import org.jikesrvm.opt.ir.OPT_Instruction; +import org.jikesrvm.opt.ir.OPT_LocationOperand; +import org.jikesrvm.opt.ir.OPT_MethodOperand; +import org.jikesrvm.opt.ir.OPT_Operators; +import org.jikesrvm.opt.ir.OPT_Register; +import org.jikesrvm.opt.ir.OPT_RegisterOperand; +import org.jikesrvm.opt.ir.OPT_TrueGuardOperand; import org.binarytranslator.generic.decoder.DecoderUtils; /** Modified: src/org/binarytranslator/generic/memory/IntAddressedPreSwappedMemory.java =================================================================== --- src/org/binarytranslator/generic/memory/IntAddressedPreSwappedMemory.java 2006-12-07 14:54:50 UTC (rev 1) +++ src/org/binarytranslator/generic/memory/IntAddressedPreSwappedMemory.java 2007-03-16 15:33:01 UTC (rev 2) @@ -8,24 +8,24 @@ */ package org.binarytranslator.generic.memory; -import com.ibm.jikesrvm.classloader.VM_Atom; -import com.ibm.jikesrvm.classloader.VM_FieldReference; -import com.ibm.jikesrvm.classloader.VM_MemberReference; -import com.ibm.jikesrvm.classloader.VM_TypeReference; -import com.ibm.jikesrvm.opt.ir.ALoad; -import com.ibm.jikesrvm.opt.ir.Binary; -import com.ibm.jikesrvm.opt.ir.GetField; -import com.ibm.jikesrvm.opt.ir.Goto; -import com.ibm.jikesrvm.opt.ir.IfCmp; -import com.ibm.jikesrvm.opt.ir.OPT_AddressConstantOperand; -import com.ibm.jikesrvm.opt.ir.OPT_BasicBlock; -import com.ibm.jikesrvm.opt.ir.OPT_ConditionOperand; -import com.ibm.jikesrvm.opt.ir.OPT_IntConstantOperand; -import com.ibm.jikesrvm.opt.ir.OPT_LocationOperand; -import com.ibm.jikesrvm.opt.ir.OPT_Register; -import com.ibm.jikesrvm.opt.ir.OPT_RegisterOperand; -import com.ibm.jikesrvm.opt.ir.OPT_TrueGuardOperand; -import com.ibm.jikesrvm.opt.ir.Unary; +import org.jikesrvm.classloader.VM_Atom; +import org.jikesrvm.classloader.VM_FieldReference; +import org.jikesrvm.classloader.VM_MemberReference; +import org.jikesrvm.classloader.VM_TypeReference; +import org.jikesrvm.opt.ir.ALoad; +import org.jikesrvm.opt.ir.Binary; +import org.jikesrvm.opt.ir.GetField; +import org.jikesrvm.opt.ir.Goto; +import org.jikesrvm.opt.ir.IfCmp; +import org.jikesrvm.opt.ir.OPT_AddressConstantOperand; +import org.jikesrvm.opt.ir.OPT_BasicBlock; +import org.jikesrvm.opt.ir.OPT_ConditionOperand; +import org.jikesrvm.opt.ir.OPT_IntConstantOperand; +import org.jikesrvm.opt.ir.OPT_LocationOperand; +import org.jikesrvm.opt.ir.OPT_Register; +import org.jikesrvm.opt.ir.OPT_RegisterOperand; +import org.jikesrvm.opt.ir.OPT_TrueGuardOperand; +import org.jikesrvm.opt.ir.Unary; import java.io.RandomAccessFile; import org.binarytranslator.generic.memory.IntAddressedMemory; import org.binarytranslator.vmInterface.TranslationHelper; Modified: src/org/binarytranslator/generic/memory/Memory.java =================================================================== --- src/org/binarytranslator/generic/memory/Memory.java 2006-12-07 14:54:50 UTC (rev 1) +++ src/org/binarytranslator/generic/memory/Memory.java 2007-03-16 15:33:01 UTC (rev 2) @@ -8,7 +8,7 @@ */ package org.binarytranslator.generic.memory; -import com.ibm.jikesrvm.opt.ir.OPT_RegisterOperand; +import org.jikesrvm.opt.ir.OPT_RegisterOperand; import org.binarytranslator.generic.decoder.DecoderUtils; import java.io.RandomAccessFile; Modified: src/org/binarytranslator/generic/os/process/ProcessSpace.java =================================================================== --- src/org/binarytranslator/generic/os/process/ProcessSpace.java 2006-12-07 14:54:50 UTC (rev 1) +++ src/org/binarytranslator/generic/os/process/ProcessSpace.java 2007-03-16 15:33:01 UTC (rev 2) @@ -11,10 +11,10 @@ import java.util.Hashtable; import java.io.*; -import com.ibm.jikesrvm.VM_CompiledMethod; -import com.ibm.jikesrvm.VM_CodeArray; -import com.ibm.jikesrvm.opt.ir.OPT_GenerationContext; -import com.ibm.jikesrvm.opt.ir.OPT_HIRGenerator; +import org.jikesrvm.VM_CompiledMethod; +import org.jikesrvm.VM_CodeArray; +import org.jikesrvm.opt.ir.OPT_GenerationContext; +import org.jikesrvm.opt.ir.OPT_HIRGenerator; import org.binarytranslator.vmInterface.DBT_Trace; import org.binarytranslator.vmInterface.DynamicCodeRunner; Modified: src/org/binarytranslator/vmInterface/DBT_ConvertBinaryToHIR.java =================================================================== --- src/org/binarytranslator/vmInterface/DBT_ConvertBinaryToHIR.java 2006-12-07 14:54:50 UTC (rev 1) +++ src/org/binarytranslator/vmInterface/DBT_ConvertBinaryToHIR.java 2007-03-16 15:33:01 UTC (rev 2) @@ -7,7 +7,7 @@ * (C) Copyright Ian Rogers, The University of Manchester 2003-2006 */ package org.binarytranslator.vmInterface; -import com.ibm.jikesrvm.opt.OPT_CompilerPhase; +import org.jikesrvm.opt.OPT_CompilerPhase; /** * The OPT_CompilerPhase which translates from PowerPC machine code Modified: src/org/binarytranslator/vmInterface/DBT_OptimizingCompilerException.java =================================================================== --- src/org/binarytranslator/vmInterface/DBT_OptimizingCompilerException.java 2006-12-07 14:54:50 UTC (rev 1) +++ src/org/binarytranslator/vmInterface/DBT_OptimizingCompilerException.java 2007-03-16 15:33:01 UTC (rev 2) @@ -8,7 +8,7 @@ */ package org.binarytranslator.vmInterface; -import com.ibm.jikesrvm.opt.OPT_OptimizingCompilerException; +import org.jikesrvm.opt.OPT_OptimizingCompilerException; /** * Use this exception if we encounter a runtime error in the binary translator Modified: src/org/binarytranslator/vmInterface/DBT_Trace.java =================================================================== --- src/org/binarytranslator/vmInterface/DBT_Trace.java 2006-12-07 14:54:50 UTC (rev 1) +++ src/org/binarytranslator/vmInterface/DBT_Trace.java 2007-03-16 15:33:01 UTC (rev 2) @@ -9,17 +9,17 @@ package org.binarytranslator.vmInterface; import org.binarytranslator.DBT_Options; import org.binarytranslator.generic.os.process.ProcessSpace; -import com.ibm.jikesrvm.classloader.VM_BootstrapClassLoader; -import com.ibm.jikesrvm.VM_CompiledMethod; -import com.ibm.jikesrvm.VM_CompiledMethods; -import com.ibm.jikesrvm.classloader.VM_NormalMethod; -import com.ibm.jikesrvm.classloader.VM_Class; -import com.ibm.jikesrvm.classloader.VM_TypeReference; -import com.ibm.jikesrvm.classloader.VM_MemberReference; -import com.ibm.jikesrvm.classloader.VM_Atom; -import com.ibm.jikesrvm.VM_Statics; -import com.ibm.jikesrvm.opt.ir.OPT_GenerationContext; -import com.ibm.jikesrvm.opt.ir.OPT_HIRGenerator; +import org.jikesrvm.classloader.VM_BootstrapClassLoader; +import org.jikesrvm.VM_CompiledMethod; +import org.jikesrvm.VM_CompiledMethods; +import org.jikesrvm.classloader.VM_NormalMethod; +import org.jikesrvm.classloader.VM_Class; +import org.jikesrvm.classloader.VM_TypeReference; +import org.jikesrvm.classloader.VM_MemberReference; +import org.jikesrvm.classloader.VM_Atom; +import org.jikesrvm.VM_Statics; +import org.jikesrvm.opt.ir.OPT_GenerationContext; +import org.jikesrvm.opt.ir.OPT_HIRGenerator; /** * A method class which can be used in place of a VM_NormalMethod but @@ -84,7 +84,7 @@ public static void configure() { VM_Atom clsDescriptor = VM_Atom.findOrCreateAsciiAtom("Lorg/binarytranslator/vmInterface/DummyDynamicCodeRunner;"); VM_Atom memName = VM_Atom.findOrCreateAsciiAtom("invokeCode"); - invokeCodeDescriptor = VM_Atom.findOrCreateAsciiAtom("(Lcom.ibm.jikesrvm/VM_CodeArray;Lorg/binarytranslator/generic/os/process/ProcessSpace;)I"); + invokeCodeDescriptor = VM_Atom.findOrCreateAsciiAtom("(Lorg/jikesrvm/VM_CodeArray;Lorg/binarytranslator/generic/os/process/ProcessSpace;)I"); VM_TypeReference tRef = VM_TypeReference.findOrCreate(VM_BootstrapClassLoader.getBootstrapClassLoader(), clsDescriptor); dummyRunnerTypeRef = VM_TypeReference.findOrCreate(VM_BootstrapClassLoader.getBootstrapClassLoader(), Modified: src/org/binarytranslator/vmInterface/DynamicCodeRunner.java =================================================================== --- src/org/binarytranslator/vmInterface/DynamicCodeRunner.java 2006-12-07 14:54:50 UTC (rev 1) +++ src/org/binarytranslator/vmInterface/DynamicCodeRunner.java 2007-03-16 15:33:01 UTC (rev 2) @@ -7,10 +7,10 @@ * (C) Copyright Ian Rogers, The University of Manchester 2003-2006 */ package org.binarytranslator.vmInterface; -import com.ibm.jikesrvm.VM; -import com.ibm.jikesrvm.VM_DynamicBridge; -import com.ibm.jikesrvm.VM_CodeArray; -import com.ibm.jikesrvm.VM_Magic; +import org.jikesrvm.VM; +import org.jikesrvm.VM_DynamicBridge; +import org.jikesrvm.VM_CodeArray; +import org.jikesrvm.VM_Magic; import org.vmmagic.pragma.Uninterruptible; import org.vmmagic.pragma.NoInlinePragma; import org.binarytranslator.DBT_Options; Modified: src/org/binarytranslator/vmInterface/TranslationHelper.java =================================================================== --- src/org/binarytranslator/vmInterface/TranslationHelper.java 2006-12-07 14:54:50 UTC (rev 1) +++ src/org/binarytranslator/vmInterface/TranslationHelper.java 2007-03-16 15:33:01 UTC (rev 2) @@ -8,13 +8,13 @@ */ package org.binarytranslator.vmInterface; -import com.ibm.jikesrvm.classloader.VM_Method; -import com.ibm.jikesrvm.classloader.VM_TypeReference; -import com.ibm.jikesrvm.opt.ir.OPT_BasicBlock; -import com.ibm.jikesrvm.opt.ir.OPT_BranchProfileOperand; -import com.ibm.jikesrvm.opt.ir.OPT_GenerationContext; -import com.ibm.jikesrvm.opt.ir.OPT_Instruction; -import com.ibm.jikesrvm.opt.ir.OPT_RegisterOperand; +import org.jikesrvm.classloader.VM_Method; +import org.jikesrvm.classloader.VM_TypeReference; +import org.jikesrvm.opt.ir.OPT_BasicBlock; +import org.jikesrvm.opt.ir.OPT_BranchProfileOperand; +import org.jikesrvm.opt.ir.OPT_GenerationContext; +import org.jikesrvm.opt.ir.OPT_Instruction; +import org.jikesrvm.opt.ir.OPT_RegisterOperand; /** * Translation helper interface This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |