[jnr-x86asm] 02/04: Imported Upstream version 1.0.2
Tony Mancill
tmancill at moszumanska.debian.org
Thu Nov 27 05:58:03 GMT 2014
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository jnr-x86asm.
commit 1d76bfff95006d68eb9d457b6656dc26d74a04ab
Author: tony mancill <tmancill at debian.org>
Date: Wed Nov 26 21:50:59 2014 -0800
Imported Upstream version 1.0.2
---
COPYING | 674 -----------------
COPYING.ASMJIT | 25 -
COPYING.LESSER | 165 -----
LICENSE | 18 +-
build.xml | 74 --
nbproject/build-impl.xml | 805 ---------------------
nbproject/genfiles.properties | 8 -
nbproject/project.properties | 64 --
nbproject/project.xml | 15 -
pom.xml | 106 +--
src/com/kenai/jnr/x86asm/CPU.java | 25 -
src/com/kenai/jnr/x86asm/CpuInfo.java | 41 --
src/com/kenai/jnr/x86asm/Logger.java | 27 -
src/com/kenai/jnr/x86asm/MMRegister.java | 42 --
src/com/kenai/jnr/x86asm/SEGMENT.java | 37 -
src/com/kenai/jnr/x86asm/X87Register.java | 46 --
src/com/kenai/jnr/x86asm/XMMRegister.java | 42 --
src/{ => main/java}/com/kenai/jnr/x86asm/Asm.java | 22 +-
.../java}/com/kenai/jnr/x86asm/Assembler.java | 22 +-
.../java}/com/kenai/jnr/x86asm/BaseReg.java | 22 +-
.../java}/com/kenai/jnr/x86asm/CONDITION.java | 22 +-
.../java/com/kenai/jnr/x86asm/CPU.java} | 33 +-
.../java}/com/kenai/jnr/x86asm/CodeBuffer.java | 41 +-
.../java/com/kenai/jnr/x86asm/CpuInfo.java} | 48 +-
.../java}/com/kenai/jnr/x86asm/ERROR_CODE.java | 22 +-
src/{ => main/java}/com/kenai/jnr/x86asm/HINT.java | 22 +-
.../java}/com/kenai/jnr/x86asm/INST_CODE.java | 23 +-
.../java}/com/kenai/jnr/x86asm/Immediate.java | 22 +-
.../kenai/jnr/x86asm/InstructionDescription.java | 22 +-
.../com/kenai/jnr/x86asm/InstructionGroup.java | 23 +-
.../java}/com/kenai/jnr/x86asm/LABEL_STATE.java | 22 +-
.../java}/com/kenai/jnr/x86asm/Label.java | 22 +-
.../java}/com/kenai/jnr/x86asm/LinkData.java | 22 +-
.../java/com/kenai/jnr/x86asm/Logger.java} | 36 +-
.../java/com/kenai/jnr/x86asm/MMRegister.java} | 49 +-
src/{ => main/java}/com/kenai/jnr/x86asm/Mem.java | 3 +
src/{ => main/java}/com/kenai/jnr/x86asm/OP.java | 22 +-
.../java}/com/kenai/jnr/x86asm/Operand.java | 22 +-
.../java}/com/kenai/jnr/x86asm/OperandFlags.java | 22 +-
.../java}/com/kenai/jnr/x86asm/PROPERTY.java | 22 +-
src/{ => main/java}/com/kenai/jnr/x86asm/REG.java | 22 +-
.../java}/com/kenai/jnr/x86asm/RELOC_MODE.java | 22 +-
src/{ => main/java}/com/kenai/jnr/x86asm/RID.java | 22 +-
.../java}/com/kenai/jnr/x86asm/Register.java | 41 +-
.../java}/com/kenai/jnr/x86asm/RelocData.java | 22 +-
.../java/com/kenai/jnr/x86asm/SEGMENT.java} | 44 +-
src/{ => main/java}/com/kenai/jnr/x86asm/SIZE.java | 22 +-
.../java}/com/kenai/jnr/x86asm/Serializer.java | 22 +-
.../java}/com/kenai/jnr/x86asm/SerializerCore.java | 22 +-
.../com/kenai/jnr/x86asm/SerializerIntrinsics.java | 22 +-
.../com/kenai/jnr/x86asm/TrampolineWriter.java | 22 +-
src/{ => main/java}/com/kenai/jnr/x86asm/Util.java | 22 +-
.../java/com/kenai/jnr/x86asm/X87Register.java} | 53 +-
.../java/com/kenai/jnr/x86asm/XMMRegister.java} | 49 +-
src/{com/kenai => main/java}/jnr/x86asm/Asm.java | 27 +-
.../kenai => main/java}/jnr/x86asm/Assembler.java | 43 +-
.../kenai => main/java}/jnr/x86asm/BaseReg.java | 25 +-
.../kenai => main/java}/jnr/x86asm/CONDITION.java | 23 +-
src/main/java/jnr/x86asm/CPU.java | 31 +
.../kenai => main/java}/jnr/x86asm/CodeBuffer.java | 42 +-
src/main/java/jnr/x86asm/CpuInfo.java | 47 ++
.../kenai => main/java}/jnr/x86asm/ERROR_CODE.java | 23 +-
src/{com/kenai => main/java}/jnr/x86asm/HINT.java | 23 +-
.../kenai => main/java}/jnr/x86asm/INST_CODE.java | 23 +-
.../kenai => main/java}/jnr/x86asm/Immediate.java | 23 +-
.../java}/jnr/x86asm/InstructionDescription.java | 31 +-
.../java}/jnr/x86asm/InstructionGroup.java | 23 +-
.../java}/jnr/x86asm/LABEL_STATE.java | 23 +-
src/{com/kenai => main/java}/jnr/x86asm/Label.java | 25 +-
.../kenai => main/java}/jnr/x86asm/LinkData.java | 23 +-
src/main/java/jnr/x86asm/Logger.java | 33 +
src/main/java/jnr/x86asm/MMRegister.java | 48 ++
src/{com/kenai => main/java}/jnr/x86asm/Mem.java | 8 +-
src/{com/kenai => main/java}/jnr/x86asm/OP.java | 23 +-
.../kenai => main/java}/jnr/x86asm/Operand.java | 25 +-
.../java}/jnr/x86asm/OperandFlags.java | 23 +-
.../kenai => main/java}/jnr/x86asm/PROPERTY.java | 23 +-
src/{com/kenai => main/java}/jnr/x86asm/REG.java | 23 +-
.../kenai => main/java}/jnr/x86asm/RELOC_MODE.java | 23 +-
src/{com/kenai => main/java}/jnr/x86asm/RID.java | 23 +-
.../kenai => main/java}/jnr/x86asm/Register.java | 50 +-
.../kenai => main/java}/jnr/x86asm/RelocData.java | 23 +-
src/main/java/jnr/x86asm/SEGMENT.java | 43 ++
src/{com/kenai => main/java}/jnr/x86asm/SIZE.java | 23 +-
.../kenai => main/java}/jnr/x86asm/Serializer.java | 23 +-
.../java}/jnr/x86asm/SerializerCore.java | 25 +-
.../java}/jnr/x86asm/SerializerIntrinsics.java | 27 +-
.../java}/jnr/x86asm/TrampolineWriter.java | 23 +-
src/{com/kenai => main/java}/jnr/x86asm/Util.java | 23 +-
src/main/java/jnr/x86asm/X87Register.java | 52 ++
src/main/java/jnr/x86asm/XMMRegister.java | 48 ++
91 files changed, 688 insertions(+), 3586 deletions(-)
diff --git a/COPYING b/COPYING
deleted file mode 100644
index 94a9ed0..0000000
--- a/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/COPYING.ASMJIT b/COPYING.ASMJIT
deleted file mode 100644
index da54634..0000000
--- a/COPYING.ASMJIT
+++ /dev/null
@@ -1,25 +0,0 @@
- While jnr-x86asm is covered under the LGPL version 3, it is based
- on code from the AsmJit project, and that copyright is reproduced below.
-
- Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
diff --git a/COPYING.LESSER b/COPYING.LESSER
deleted file mode 100644
index fc8a5de..0000000
--- a/COPYING.LESSER
+++ /dev/null
@@ -1,165 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/LICENSE b/LICENSE
index 268da40..a6534a3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,21 +1,5 @@
-
- This code is free software: you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License version 3 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- version 3 for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
-
-
-Although the jnr-x86asm is covered under the LGPLv3 as stated above, some of the code is based
-on the asmjit project (http://code.google.com/p/asmjit/) and the license for that project is reproduced here. This does _NOT_ mean jnr-x86asm is dual licensed, it is covered solely by the LPGLv3.
-
+ Copyright (C) 2010 Wayne Meissner
Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
Permission is hereby granted, free of charge, to any person
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 64298d8..0000000
--- a/build.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="jnr-x86asm" default="default" basedir=".">
- <description>Builds, tests, and runs the project jnr-x86asm.</description>
- <import file="nbproject/build-impl.xml"/>
- <!--
-
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
-
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
- -pre-compile-single: called before javac compilation of single file
- -post-compile-single: called after javac compilation of single file
- -pre-compile-test: called before javac compilation of JUnit tests
- -post-compile-test: called after javac compilation of JUnit tests
- -pre-compile-test-single: called before javac compilation of single JUnit test
- -post-compile-test-single: called after javac compilation of single JUunit test
- -pre-jar: called before JAR building
- -post-jar: called after JAR building
- -post-clean: called after cleaning build products
-
- (Targets beginning with '-' are not intended to be called on their own.)
-
- Example of inserting an obfuscator after compilation could look like this:
-
- <target name="-post-compile">
- <obfuscate>
- <fileset dir="${build.classes.dir}"/>
- </obfuscate>
- </target>
-
- For list of available properties check the imported
- nbproject/build-impl.xml file.
-
-
- Another way to customize the build is by overriding existing main targets.
- The targets of interest are:
-
- -init-macrodef-javac: defines macro for javac compilation
- -init-macrodef-junit: defines macro for junit execution
- -init-macrodef-debug: defines macro for class debugging
- -init-macrodef-java: defines macro for class execution
- -do-jar-with-manifest: JAR building (if you are using a manifest)
- -do-jar-without-manifest: JAR building (if you are not using a manifest)
- run: execution of project
- -javadoc-build: Javadoc generation
- test-report: JUnit report generation
-
- An example of overriding the target for project execution could look like this:
-
- <target name="run" depends="jnr-x86asm-impl.jar">
- <exec dir="bin" executable="launcher.exe">
- <arg file="${dist.jar}"/>
- </exec>
- </target>
-
- Notice that the overridden target depends on the jar target and not only on
- the compile target as the regular run target does. Again, for a list of available
- properties which you can use, check the target you are overriding in the
- nbproject/build-impl.xml file.
-
- -->
-</project>
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
deleted file mode 100644
index fff7304..0000000
--- a/nbproject/build-impl.xml
+++ /dev/null
@@ -1,805 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT ***
-*** EDIT ../build.xml INSTEAD ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
- - initialization
- - compilation
- - jar
- - execution
- - debugging
- - javadoc
- - junit compilation
- - junit execution
- - junit debugging
- - applet
- - cleanup
-
- -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="jnr-x86asm-impl">
- <fail message="Please build using Ant 1.7.1 or higher.">
- <condition>
- <not>
- <antversion atleast="1.7.1"/>
- </not>
- </condition>
- </fail>
- <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
- <!--
- ======================
- INITIALIZATION SECTION
- ======================
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init" name="-init-private">
- <property file="nbproject/private/config.properties"/>
- <property file="nbproject/private/configs/${config}.properties"/>
- <property file="nbproject/private/private.properties"/>
- </target>
- <target depends="-pre-init,-init-private" name="-init-user">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user" name="-init-project">
- <property file="nbproject/configs/${config}.properties"/>
- <property file="nbproject/project.properties"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
- <available file="${manifest.file}" property="manifest.available"/>
- <condition property="main.class.available">
- <and>
- <isset property="main.class"/>
- <not>
- <equals arg1="${main.class}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <condition property="manifest.available+main.class">
- <and>
- <isset property="manifest.available"/>
- <isset property="main.class.available"/>
- </and>
- </condition>
- <condition property="do.mkdist">
- <and>
- <isset property="libs.CopyLibs.classpath"/>
- <not>
- <istrue value="${mkdist.disabled}"/>
- </not>
- </and>
- </condition>
- <condition property="manifest.available+main.class+mkdist.available">
- <and>
- <istrue value="${manifest.available+main.class}"/>
- <isset property="do.mkdist"/>
- </and>
- </condition>
- <condition property="manifest.available+mkdist.available">
- <and>
- <istrue value="${manifest.available}"/>
- <isset property="do.mkdist"/>
- </and>
- </condition>
- <condition property="manifest.available-mkdist.available">
- <or>
- <istrue value="${manifest.available}"/>
- <isset property="do.mkdist"/>
- </or>
- </condition>
- <condition property="manifest.available+main.class-mkdist.available">
- <or>
- <istrue value="${manifest.available+main.class}"/>
- <isset property="do.mkdist"/>
- </or>
- </condition>
- <condition property="have.tests">
- <or>
- <available file="${test.src.dir}"/>
- </or>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <and>
- <isset property="javadoc.preview"/>
- <isfalse value="${javadoc.preview}"/>
- </and>
- </condition>
- <property name="run.jvmargs" value=""/>
- <property name="javac.compilerargs" value=""/>
- <property name="work.dir" value="${basedir}"/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <property name="javac.debug" value="true"/>
- <property name="javadoc.preview" value="true"/>
- <property name="application.args" value=""/>
- <property name="source.encoding" value="${file.encoding}"/>
- <property name="runtime.encoding" value="${source.encoding}"/>
- <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
- <and>
- <isset property="javadoc.encoding"/>
- <not>
- <equals arg1="${javadoc.encoding}" arg2=""/>
- </not>
- </and>
- </condition>
- <property name="javadoc.encoding.used" value="${source.encoding}"/>
- <property name="includes" value="**"/>
- <property name="excludes" value=""/>
- <property name="do.depend" value="false"/>
- <condition property="do.depend.true">
- <istrue value="${do.depend}"/>
- </condition>
- <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
- <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
- <length length="0" string="${endorsed.classpath}" when="greater"/>
- </condition>
- <property name="javac.fork" value="false"/>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="test.src.dir">Must set test.src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
- <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.jar">Must set dist.jar</fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-javac">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}" name="classpath"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="sourcepath"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}" name="classpath"/>
- <sequential>
- <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </depend>
- </sequential>
- </macrodef>
- <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${build.classes.dir}" name="destdir"/>
- <sequential>
- <fail unless="javac.includes">Must set javac.includes</fail>
- <pathconvert pathsep="," property="javac.includes.binary">
- <path>
- <filelist dir="@{destdir}" files="${javac.includes}"/>
- </path>
- <globmapper from="*.java" to="*.class"/>
- </pathconvert>
- <delete>
- <files includes="${javac.includes.binary}"/>
- </delete>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="**" name="testincludes"/>
- <sequential>
- <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">
- <batchtest todir="${build.test.results.dir}">
- <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
- </batchtest>
- <classpath>
- <path path="${run.test.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${run.jvmargs}"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
- <attribute default="${main.class}" name="name"/>
- <attribute default="${debug.classpath}" name="classpath"/>
- <attribute default="" name="stopclassname"/>
- <sequential>
- <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
- <attribute default="${build.classes.dir}" name="dir"/>
- <sequential>
- <nbjpdareload>
- <fileset dir="@{dir}" includes="${fix.classes}">
- <include name="${fix.includes}*.class"/>
- </fileset>
- </nbjpdareload>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-debug-args">
- <property name="version-output" value="java version "${ant.java.version}"/>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
- <os family="windows"/>
- </condition>
- <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
- <isset property="debug.transport"/>
- </condition>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-debug">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}" name="classpath"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" dir="${work.dir}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${debug-args-line}"/>
- <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
- <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
- <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
- <jvmarg line="${run.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${run.classpath}" name="classpath"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" dir="${work.dir}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
- <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
- <jvmarg line="${run.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-presetdef-jar">
- <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
- <jar compress="${jar.compress}" jarfile="${dist.jar}">
- <j2seproject1:fileset dir="${build.classes.dir}"/>
- </jar>
- </presetdef>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
- <!--
- ===================
- COMPILATION SECTION
- ===================
- -->
- <target name="-deps-jar-init" unless="built-jar.properties">
- <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
- <delete file="${built-jar.properties}" quiet="true"/>
- </target>
- <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
- <echo level="warn" message="Cycle detected: jnr-x86asm was already built"/>
- </target>
- <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
- <mkdir dir="${build.dir}"/>
- <touch file="${built-jar.properties}" verbose="false"/>
- <property file="${built-jar.properties}" prefix="already.built.jar."/>
- <antcall target="-warn-already-built-jar"/>
- <propertyfile file="${built-jar.properties}">
- <entry key="${basedir}" value=""/>
- </propertyfile>
- </target>
- <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
- <target depends="init" name="-check-automatic-build">
- <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
- </target>
- <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
- <antcall target="clean"/>
- </target>
- <target depends="init,deps-jar" name="-pre-pre-compile">
- <mkdir dir="${build.classes.dir}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target if="do.depend.true" name="-compile-depend">
- <pathconvert property="build.generated.subdirs">
- <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </pathconvert>
- <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
- <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <j2seproject3:force-recompile/>
- <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
- <!--
- ====================
- JAR BUILDING SECTION
- ====================
- -->
- <target depends="init" name="-pre-pre-jar">
- <dirname file="${dist.jar}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- </target>
- <target name="-pre-jar">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
- <j2seproject1:jar/>
- </target>
- <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
- <j2seproject1:jar manifest="${manifest.file}"/>
- </target>
- <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
- <j2seproject1:jar manifest="${manifest.file}">
- <j2seproject1:manifest>
- <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
- </j2seproject1:manifest>
- </j2seproject1:jar>
- <echo>To run this application from the command line without Ant, try:</echo>
- <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
- <property location="${dist.jar}" name="dist.jar.resolved"/>
- <pathconvert property="run.classpath.with.dist.jar">
- <path path="${run.classpath}"/>
- <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
- </pathconvert>
- <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
- </target>
- <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
- <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
- <pathconvert property="run.classpath.without.build.classes.dir">
- <path path="${run.classpath}"/>
- <map from="${build.classes.dir.resolved}" to=""/>
- </pathconvert>
- <pathconvert pathsep=" " property="jar.classpath">
- <path path="${run.classpath.without.build.classes.dir}"/>
- <chainedmapper>
- <flattenmapper/>
- <globmapper from="*" to="lib/*"/>
- </chainedmapper>
- </pathconvert>
- <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
- <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
- <fileset dir="${build.classes.dir}"/>
- <manifest>
- <attribute name="Main-Class" value="${main.class}"/>
- <attribute name="Class-Path" value="${jar.classpath}"/>
- </manifest>
- </copylibs>
- <echo>To run this application from the command line without Ant, try:</echo>
- <property location="${dist.jar}" name="dist.jar.resolved"/>
- <echo>java -jar "${dist.jar.resolved}"</echo>
- </target>
- <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+mkdist.available" name="-do-jar-with-libraries-without-mainclass" unless="main.class.available">
- <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
- <pathconvert property="run.classpath.without.build.classes.dir">
- <path path="${run.classpath}"/>
- <map from="${build.classes.dir.resolved}" to=""/>
- </pathconvert>
- <pathconvert pathsep=" " property="jar.classpath">
- <path path="${run.classpath.without.build.classes.dir}"/>
- <chainedmapper>
- <flattenmapper/>
- <globmapper from="*" to="lib/*"/>
- </chainedmapper>
- </pathconvert>
- <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
- <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
- <fileset dir="${build.classes.dir}"/>
- <manifest>
- <attribute name="Class-Path" value="${jar.classpath}"/>
- </manifest>
- </copylibs>
- </target>
- <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.mkdist" name="-do-jar-with-libraries-without-manifest" unless="manifest.available">
- <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
- <pathconvert property="run.classpath.without.build.classes.dir">
- <path path="${run.classpath}"/>
- <map from="${build.classes.dir.resolved}" to=""/>
- </pathconvert>
- <pathconvert pathsep=" " property="jar.classpath">
- <path path="${run.classpath.without.build.classes.dir}"/>
- <chainedmapper>
- <flattenmapper/>
- <globmapper from="*" to="lib/*"/>
- </chainedmapper>
- </pathconvert>
- <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
- <copylibs compress="${jar.compress}" jarfile="${dist.jar}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
- <fileset dir="${build.classes.dir}"/>
- <manifest>
- <attribute name="Class-Path" value="${jar.classpath}"/>
- </manifest>
- </copylibs>
- </target>
- <target name="-post-jar">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-do-jar-with-libraries-without-mainclass,-do-jar-with-libraries-without-manifest,-post-jar" description="Build JAR." name="jar"/>
- <!--
- =================
- EXECUTION SECTION
- =================
- -->
- <target depends="init,compile" description="Run a main class." name="run">
- <j2seproject1:java>
- <customize>
- <arg line="${application.args}"/>
- </customize>
- </j2seproject1:java>
- </target>
- <target name="-do-not-recompile">
- <property name="javac.includes.binary" value=""/>
- </target>
- <target depends="init,compile-single" name="run-single">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <j2seproject1:java classname="${run.class}"/>
- </target>
- <target depends="init,compile-test-single" name="run-test-with-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
- </target>
- <!--
- =================
- DEBUGGING SECTION
- =================
- -->
- <target depends="init" if="netbeans.home" name="-debug-start-debugger">
- <j2seproject1:nbjpdastart name="${debug.class}"/>
- </target>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
- <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
- </target>
- <target depends="init,compile" name="-debug-start-debuggee">
- <j2seproject3:debug>
- <customize>
- <arg line="${application.args}"/>
- </customize>
- </j2seproject3:debug>
- </target>
- <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
- <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
- </target>
- <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
- <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <j2seproject3:debug classname="${debug.class}"/>
- </target>
- <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
- <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
- </target>
- <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
- <target depends="init" name="-pre-debug-fix">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
- <j2seproject1:nbjpdareload/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
- <!--
- ===============
- JAVADOC SECTION
- ===============
- -->
- <target depends="init" name="-javadoc-build">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
- <classpath>
- <path path="${javac.classpath}"/>
- </classpath>
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
- <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
- <include name="**/*.java"/>
- </fileset>
- </javadoc>
- </target>
- <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
- <!--
- =========================
- JUNIT COMPILATION SECTION
- =========================
- -->
- <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
- <mkdir dir="${build.test.classes.dir}"/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target if="do.depend.true" name="-compile-test-depend">
- <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
- <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
- <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
- <!--
- =======================
- JUNIT EXECUTION SECTION
- =======================
- -->
- <target depends="init" if="have.tests" name="-pre-test-run">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
- <j2seproject3:junit testincludes="**/*Test.java"/>
- </target>
- <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init" if="have.tests" name="test-report"/>
- <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
- <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
- <target depends="init" if="have.tests" name="-pre-test-run-single">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <j2seproject3:junit excludes="" includes="${test.includes}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
- <!--
- =======================
- JUNIT DEBUGGING SECTION
- =======================
- -->
- <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
- <delete file="${test.report.file}"/>
- <mkdir dir="${build.test.results.dir}"/>
- <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
- <customize>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <arg value="${test.class}"/>
- <arg value="showoutput=true"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
- </customize>
- </j2seproject3:debug>
- </target>
- <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
- <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
- </target>
- <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
- <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
- <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
- <!--
- =========================
- APPLET EXECUTION SECTION
- =========================
- -->
- <target depends="init,compile-single" name="run-applet">
- <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
- <j2seproject1:java classname="sun.applet.AppletViewer">
- <customize>
- <arg value="${applet.url}"/>
- </customize>
- </j2seproject1:java>
- </target>
- <!--
- =========================
- APPLET DEBUGGING SECTION
- =========================
- -->
- <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
- <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
- <j2seproject3:debug classname="sun.applet.AppletViewer">
- <customize>
- <arg value="${applet.url}"/>
- </customize>
- </j2seproject3:debug>
- </target>
- <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
- <!--
- ===============
- CLEANUP SECTION
- ===============
- -->
- <target name="-deps-clean-init" unless="built-clean.properties">
- <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
- <delete file="${built-clean.properties}" quiet="true"/>
- </target>
- <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
- <echo level="warn" message="Cycle detected: jnr-x86asm was already built"/>
- </target>
- <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
- <mkdir dir="${build.dir}"/>
- <touch file="${built-clean.properties}" verbose="false"/>
- <property file="${built-clean.properties}" prefix="already.built.clean."/>
- <antcall target="-warn-already-built-clean"/>
- <propertyfile file="${built-clean.properties}">
- <entry key="${basedir}" value=""/>
- </propertyfile>
- </target>
- <target depends="init" name="-do-clean">
- <delete dir="${build.dir}"/>
- <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
- <target name="-check-call-dep">
- <property file="${call.built.properties}" prefix="already.built."/>
- <condition property="should.call.dep">
- <not>
- <isset property="already.built.${call.subproject}"/>
- </not>
- </condition>
- </target>
- <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
- <ant antfile="${call.script}" inheritall="false" target="${call.target}">
- <propertyset>
- <propertyref prefix="transfer."/>
- <mapper from="transfer.*" to="*" type="glob"/>
- </propertyset>
- </ant>
- </target>
-</project>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
deleted file mode 100644
index e82933f..0000000
--- a/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=71726615
-build.xml.script.CRC32=798cf52a
-build.xml.stylesheet.CRC32=958a1d3e at 1.32.1.45
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=71726615
-nbproject/build-impl.xml.script.CRC32=acc18bb5
-nbproject/build-impl.xml.stylesheet.CRC32=576378a2 at 1.32.1.45
diff --git a/nbproject/project.properties b/nbproject/project.properties
deleted file mode 100644
index a0e572d..0000000
--- a/nbproject/project.properties
+++ /dev/null
@@ -1,64 +0,0 @@
-application.title=jnr-x86asm
-application.vendor=wayne
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
- ${run.classpath}
-debug.test.classpath=\
- ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/jnr-x86asm.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-includes=**
-jar.compress=true
-javac.classpath=
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
-javac.test.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}:\
- ${libs.junit.classpath}:\
- ${libs.junit_4.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
-meta.inf.dir=${src.dir}/META-INF
-platform.active=default_platform
-run.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
-run.test.classpath=\
- ${javac.test.classpath}:\
- ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test
diff --git a/nbproject/project.xml b/nbproject/project.xml
deleted file mode 100644
index 28c4086..0000000
--- a/nbproject/project.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.java.j2seproject</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
- <name>jnr-x86asm</name>
- <source-roots>
- <root id="src.dir"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir"/>
- </test-roots>
- </data>
- </configuration>
-</project>
diff --git a/pom.xml b/pom.xml
index 90fc6b2..ec9d003 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,61 +1,33 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jruby.extras</groupId>
+ <parent>
+ <groupId>org.sonatype.oss</groupId>
+ <artifactId>oss-parent</artifactId>
+ <version>7</version>
+ </parent>
+
+ <groupId>com.github.jnr</groupId>
<artifactId>jnr-x86asm</artifactId>
<packaging>jar</packaging>
- <version>0.1</version>
+ <version>1.0.2</version>
<name>jnr-x86asm</name>
<description>A pure-java X86 and X86_64 assembler</description>
- <url>http://jnr.kenai.com</url>
+ <url>http://github.com/jnr/jnr-x86asm</url>
+
<licenses>
<license>
- <name>GNU Lesser General Public License Version 3</name>
- <url>http://www.gnu.org/licenses/lgpl-3.0.txt</url>
+ <name>MIT License</name>
+ <url>http://www.opensource.org/licenses/mit-license.php</url>
<distribution>repo</distribution>
</license>
</licenses>
+
<scm>
- <connection>scm:git:http://github.com/wmeissner/jnr-x86asm.git</connection>
- <url>http://github.com/wmeissner/jnr-x86asm</url>
+ <connection>scm:git:git at github.com:jnr/jnr-x86asm.git</connection>
+ <developerConnection>scm:git:git at github.com:jnr/jnr-x86asm.git</developerConnection>
+ <url>git at github.com:jnr/jnr-x86asm.git</url>
</scm>
- <distributionManagement>
- <repository>
- <id>codehaus-jruby-repository</id>
- <name>JRuby Central Repository</name>
- <url>dav:https://dav.codehaus.org/repository/jruby</url>
- </repository>
- <snapshotRepository>
- <id>codehaus-jruby-snapshot-repository</id>
- <name>JRuby Central Development Repository</name>
- <url>dav:https://dav.codehaus.org/snapshots.repository/jruby</url>
- </snapshotRepository>
- </distributionManagement>
- <repositories>
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- </repository>
- <repository>
- <id>codehaus</id>
- <name>Codehaus Repository</name>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <url>http://repository.codehaus.org</url>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- </pluginRepository>
- </pluginRepositories>
+
<developers>
<developer>
<id>wmeissner</id>
@@ -63,45 +35,19 @@
<email>wmeissner at gmail.com</email>
</developer>
</developers>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- <maven.test.failure.ignore>true</maven.test.failure.ignore>
- </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.5</version>
+ <version>4.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <sourceDirectory>src</sourceDirectory>
- <testSourceDirectory>test</testSourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- <extensions>
- <extension>
- <groupId>org.jvnet.wagon-svn</groupId>
- <artifactId>wagon-svn</artifactId>
- <version>1.8</version>
- </extension>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- </extension>
- </extensions>
- </build>
- <!--<reporting>
- <outputDirectory>build/report</outputDirectory>
- </reporting>-->
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.5</maven.compiler.source>
+ <maven.compiler.target>1.5</maven.compiler.target>
+ </properties>
</project>
diff --git a/src/com/kenai/jnr/x86asm/CPU.java b/src/com/kenai/jnr/x86asm/CPU.java
deleted file mode 100644
index 4adcfa9..0000000
--- a/src/com/kenai/jnr/x86asm/CPU.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.kenai.jnr.x86asm;
-
-
-public enum CPU {
- X86_32, X86_64;
- public static final CPU I386 = X86_32;
-}
diff --git a/src/com/kenai/jnr/x86asm/CpuInfo.java b/src/com/kenai/jnr/x86asm/CpuInfo.java
deleted file mode 100644
index 3a7f212..0000000
--- a/src/com/kenai/jnr/x86asm/CpuInfo.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.kenai.jnr.x86asm;
-
-/**
- * Information about target CPU
- */
-public class CpuInfo {
-
- final Vendor vendor;
- final int family;
-
- public enum Vendor {
- INTEL,
- AMD,
- GENERIC;
- }
-
- public static final CpuInfo GENERIC = new CpuInfo(Vendor.GENERIC, 0);
-
- public CpuInfo(Vendor vendor, int family) {
- this.vendor = vendor;
- this.family = family;
- }
-}
diff --git a/src/com/kenai/jnr/x86asm/Logger.java b/src/com/kenai/jnr/x86asm/Logger.java
deleted file mode 100644
index a41fd45..0000000
--- a/src/com/kenai/jnr/x86asm/Logger.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.kenai.jnr.x86asm;
-
-/**
- * Simple wrapper around logging
- */
-public class Logger {
- public void log(String msg) {}
- public void logAlign(long m) {}
-}
diff --git a/src/com/kenai/jnr/x86asm/MMRegister.java b/src/com/kenai/jnr/x86asm/MMRegister.java
deleted file mode 100644
index 550676e..0000000
--- a/src/com/kenai/jnr/x86asm/MMRegister.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.kenai.jnr.x86asm;
-
-public final class MMRegister extends BaseReg {
- /** Internal cache of mm registers */
- static final MMRegister[] cache = new MMRegister[8];
-
- static {
- for (int i = 0; i < cache.length; ++i) {
- cache[i] = new MMRegister(REG.REG_MM | i, 8);
- }
- }
-
- private MMRegister(int code, int size) {
- super(code, size);
- }
-
- public static final MMRegister mm(int code) {
- if (code >= 0 && code < cache.length) {
- return cache[code];
- }
-
- throw new IllegalArgumentException("invalid mm register");
- }
-}
diff --git a/src/com/kenai/jnr/x86asm/SEGMENT.java b/src/com/kenai/jnr/x86asm/SEGMENT.java
deleted file mode 100644
index e6d4e78..0000000
--- a/src/com/kenai/jnr/x86asm/SEGMENT.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.kenai.jnr.x86asm;
-
-/**
- * Segment override prefixes.
- */
-public enum SEGMENT {
- SEGMENT_NONE(0), SEGMENT_CS(0x2E), SEGMENT_SS(0x36),
- SEGMENT_DS(0x3E), SEGMENT_ES(0x26), SEGMENT_FS(0x64), SEGMENT_GS(0x64);
-
- private final int prefix;
-
- SEGMENT(int prefix) {
- this.prefix = prefix;
- }
-
- public final int prefix() {
- return this.prefix;
- }
-}
diff --git a/src/com/kenai/jnr/x86asm/X87Register.java b/src/com/kenai/jnr/x86asm/X87Register.java
deleted file mode 100644
index a1e0072..0000000
--- a/src/com/kenai/jnr/x86asm/X87Register.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.kenai.jnr.x86asm;
-
-public final class X87Register extends BaseReg {
- /** Internal cache of xmm registers */
- static final X87Register[] cache = new X87Register[16];
-
- static {
- for (int i = 0; i < cache.length; ++i) {
- cache[i] = new X87Register(REG.REG_X87 | i, 10);
- }
- }
-
- private X87Register(int code, int size) {
- super(code, size);
- }
-
- public static final X87Register st(int idx) {
- return x87(idx);
- }
-
- public static final X87Register x87(int idx) {
- if (idx >= 0 && idx < cache.length) {
- return cache[idx];
- }
-
- throw new IllegalArgumentException("invalid x87 register");
- }
-}
diff --git a/src/com/kenai/jnr/x86asm/XMMRegister.java b/src/com/kenai/jnr/x86asm/XMMRegister.java
deleted file mode 100644
index 07f57f7..0000000
--- a/src/com/kenai/jnr/x86asm/XMMRegister.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.kenai.jnr.x86asm;
-
-public final class XMMRegister extends BaseReg {
- /** Internal cache of xmm registers */
- static final XMMRegister[] cache = new XMMRegister[16];
-
- static {
- for (int i = 0; i < cache.length; ++i) {
- cache[i] = new XMMRegister(REG.REG_XMM | i, 16);
- }
- }
-
- private XMMRegister(int code, int size) {
- super(code, size);
- }
-
- public static final XMMRegister xmm(int idx) {
- if (idx >= 0 && idx < cache.length) {
- return cache[idx];
- }
-
- throw new IllegalArgumentException("invalid xmm register");
- }
-}
diff --git a/src/com/kenai/jnr/x86asm/Asm.java b/src/main/java/com/kenai/jnr/x86asm/Asm.java
similarity index 96%
copy from src/com/kenai/jnr/x86asm/Asm.java
copy to src/main/java/com/kenai/jnr/x86asm/Asm.java
index 3de88b1..f9eabdc 100644
--- a/src/com/kenai/jnr/x86asm/Asm.java
+++ b/src/main/java/com/kenai/jnr/x86asm/Asm.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -47,6 +28,7 @@ package com.kenai.jnr.x86asm;
import static com.kenai.jnr.x86asm.REG.*;
import static com.kenai.jnr.x86asm.SIZE.*;
+ at Deprecated
public final class Asm {
private Asm() {}
diff --git a/src/com/kenai/jnr/x86asm/Assembler.java b/src/main/java/com/kenai/jnr/x86asm/Assembler.java
similarity index 98%
copy from src/com/kenai/jnr/x86asm/Assembler.java
copy to src/main/java/com/kenai/jnr/x86asm/Assembler.java
index 5e682a3..25a4d2f 100644
--- a/src/com/kenai/jnr/x86asm/Assembler.java
+++ b/src/main/java/com/kenai/jnr/x86asm/Assembler.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -62,6 +43,7 @@ import static com.kenai.jnr.x86asm.Util.*;
/**
* Low level code generation.
*/
+ at Deprecated
public final class Assembler extends Serializer {
private final CodeBuffer _buffer = new CodeBuffer();
private final List<RelocData> _relocData = new LinkedList<RelocData>();
diff --git a/src/com/kenai/jnr/x86asm/BaseReg.java b/src/main/java/com/kenai/jnr/x86asm/BaseReg.java
similarity index 70%
copy from src/com/kenai/jnr/x86asm/BaseReg.java
copy to src/main/java/com/kenai/jnr/x86asm/BaseReg.java
index 1d5cb59..d7aeae8 100644
--- a/src/com/kenai/jnr/x86asm/BaseReg.java
+++ b/src/main/java/com/kenai/jnr/x86asm/BaseReg.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -45,6 +26,7 @@ package com.kenai.jnr.x86asm;
import static com.kenai.jnr.x86asm.REG.*;
+ at Deprecated
public abstract class BaseReg extends Operand {
public final int code;
diff --git a/src/com/kenai/jnr/x86asm/CONDITION.java b/src/main/java/com/kenai/jnr/x86asm/CONDITION.java
similarity index 76%
copy from src/com/kenai/jnr/x86asm/CONDITION.java
copy to src/main/java/com/kenai/jnr/x86asm/CONDITION.java
index 42e43a3..884b4a5 100644
--- a/src/com/kenai/jnr/x86asm/CONDITION.java
+++ b/src/main/java/com/kenai/jnr/x86asm/CONDITION.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -47,6 +28,7 @@ package com.kenai.jnr.x86asm;
/**
*
*/
+ at Deprecated
public enum CONDITION {
//! @brief No condition code.
C_NO_CONDITION (-1),
diff --git a/src/com/kenai/jnr/x86asm/RELOC_MODE.java b/src/main/java/com/kenai/jnr/x86asm/CPU.java
similarity index 50%
copy from src/com/kenai/jnr/x86asm/RELOC_MODE.java
copy to src/main/java/com/kenai/jnr/x86asm/CPU.java
index 39c2488..18b6af2 100644
--- a/src/com/kenai/jnr/x86asm/RELOC_MODE.java
+++ b/src/main/java/com/kenai/jnr/x86asm/CPU.java
@@ -1,25 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
-// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
+// Copyright (C) 2010 Wayne Meissner
//
// Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation
@@ -44,11 +24,8 @@
package com.kenai.jnr.x86asm;
-/** Relocation info */
-public enum RELOC_MODE {
- /** No relocation. */
- RELOC_NONE,
-
- /** Overwrite relocation (immediates as constants). */
- RELOC_OVERWRITE;
+ at Deprecated
+public enum CPU {
+ X86_32, X86_64;
+ public static final CPU I386 = X86_32;
}
diff --git a/src/com/kenai/jnr/x86asm/CodeBuffer.java b/src/main/java/com/kenai/jnr/x86asm/CodeBuffer.java
similarity index 65%
copy from src/com/kenai/jnr/x86asm/CodeBuffer.java
copy to src/main/java/com/kenai/jnr/x86asm/CodeBuffer.java
index d6686fa..381587e 100644
--- a/src/com/kenai/jnr/x86asm/CodeBuffer.java
+++ b/src/main/java/com/kenai/jnr/x86asm/CodeBuffer.java
@@ -1,20 +1,26 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
+//
+// Copyright (C) 2010 Wayne Meissner
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
package com.kenai.jnr.x86asm;
@@ -24,6 +30,7 @@ import java.nio.ByteOrder;
/**
*
*/
+ at Deprecated
final class CodeBuffer {
private ByteBuffer buf;
diff --git a/src/com/kenai/jnr/x86asm/RELOC_MODE.java b/src/main/java/com/kenai/jnr/x86asm/CpuInfo.java
similarity index 50%
copy from src/com/kenai/jnr/x86asm/RELOC_MODE.java
copy to src/main/java/com/kenai/jnr/x86asm/CpuInfo.java
index 39c2488..36024c7 100644
--- a/src/com/kenai/jnr/x86asm/RELOC_MODE.java
+++ b/src/main/java/com/kenai/jnr/x86asm/CpuInfo.java
@@ -1,25 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
-// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
+// Copyright (C) 2010 Wayne Meissner
//
// Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation
@@ -44,11 +24,25 @@
package com.kenai.jnr.x86asm;
-/** Relocation info */
-public enum RELOC_MODE {
- /** No relocation. */
- RELOC_NONE,
+/**
+ * Information about target CPU
+ */
+ at Deprecated
+public class CpuInfo {
+
+ final Vendor vendor;
+ final int family;
+
+ public enum Vendor {
+ INTEL,
+ AMD,
+ GENERIC;
+ }
+
+ public static final CpuInfo GENERIC = new CpuInfo(Vendor.GENERIC, 0);
- /** Overwrite relocation (immediates as constants). */
- RELOC_OVERWRITE;
+ public CpuInfo(Vendor vendor, int family) {
+ this.vendor = vendor;
+ this.family = family;
+ }
}
diff --git a/src/com/kenai/jnr/x86asm/ERROR_CODE.java b/src/main/java/com/kenai/jnr/x86asm/ERROR_CODE.java
similarity index 72%
copy from src/com/kenai/jnr/x86asm/ERROR_CODE.java
copy to src/main/java/com/kenai/jnr/x86asm/ERROR_CODE.java
index d8ecb4f..d18c1a1 100644
--- a/src/com/kenai/jnr/x86asm/ERROR_CODE.java
+++ b/src/main/java/com/kenai/jnr/x86asm/ERROR_CODE.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -44,6 +25,7 @@
package com.kenai.jnr.x86asm;
+ at Deprecated
public enum ERROR_CODE {
/** No error (success). */
diff --git a/src/com/kenai/jnr/x86asm/HINT.java b/src/main/java/com/kenai/jnr/x86asm/HINT.java
similarity index 68%
copy from src/com/kenai/jnr/x86asm/HINT.java
copy to src/main/java/com/kenai/jnr/x86asm/HINT.java
index 622de41..1d6541c 100644
--- a/src/com/kenai/jnr/x86asm/HINT.java
+++ b/src/main/java/com/kenai/jnr/x86asm/HINT.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -48,6 +29,7 @@ package com.kenai.jnr.x86asm;
/**
* Condition hint, see @c AsmJit::Serializer::jz() and friends.
*/
+ at Deprecated
public enum HINT {
/** No hint. */
diff --git a/src/com/kenai/jnr/x86asm/INST_CODE.java b/src/main/java/com/kenai/jnr/x86asm/INST_CODE.java
similarity index 95%
copy from src/com/kenai/jnr/x86asm/INST_CODE.java
copy to src/main/java/com/kenai/jnr/x86asm/INST_CODE.java
index 6154621..92686a9 100644
--- a/src/com/kenai/jnr/x86asm/INST_CODE.java
+++ b/src/main/java/com/kenai/jnr/x86asm/INST_CODE.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -44,7 +25,7 @@
package com.kenai.jnr.x86asm;
-
+ at Deprecated
public enum INST_CODE {
INST_ADC, // X86/X64
INST_ADD, // X86/X64
diff --git a/src/com/kenai/jnr/x86asm/Immediate.java b/src/main/java/com/kenai/jnr/x86asm/Immediate.java
similarity index 76%
copy from src/com/kenai/jnr/x86asm/Immediate.java
copy to src/main/java/com/kenai/jnr/x86asm/Immediate.java
index d30c0eb..85ff26a 100644
--- a/src/com/kenai/jnr/x86asm/Immediate.java
+++ b/src/main/java/com/kenai/jnr/x86asm/Immediate.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -47,6 +28,7 @@ package com.kenai.jnr.x86asm;
/**
*
*/
+ at Deprecated
public final class Immediate extends Operand {
private final long value;
private final boolean isUnsigned;
diff --git a/src/com/kenai/jnr/x86asm/InstructionDescription.java b/src/main/java/com/kenai/jnr/x86asm/InstructionDescription.java
similarity index 98%
copy from src/com/kenai/jnr/x86asm/InstructionDescription.java
copy to src/main/java/com/kenai/jnr/x86asm/InstructionDescription.java
index f7228b7..8b267cd 100644
--- a/src/com/kenai/jnr/x86asm/InstructionDescription.java
+++ b/src/main/java/com/kenai/jnr/x86asm/InstructionDescription.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -51,6 +32,7 @@ import static com.kenai.jnr.x86asm.INST_CODE.*;
import static com.kenai.jnr.x86asm.InstructionGroup.*;
import static com.kenai.jnr.x86asm.OperandFlags.*;
+ at Deprecated
public final class InstructionDescription {
final INST_CODE code;
final String name;
diff --git a/src/com/kenai/jnr/x86asm/InstructionGroup.java b/src/main/java/com/kenai/jnr/x86asm/InstructionGroup.java
similarity index 78%
copy from src/com/kenai/jnr/x86asm/InstructionGroup.java
copy to src/main/java/com/kenai/jnr/x86asm/InstructionGroup.java
index bc5b466..69051dc 100644
--- a/src/com/kenai/jnr/x86asm/InstructionGroup.java
+++ b/src/main/java/com/kenai/jnr/x86asm/InstructionGroup.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -44,7 +25,7 @@
package com.kenai.jnr.x86asm;
-
+ at Deprecated
public enum InstructionGroup {
I_EMIT,
diff --git a/src/com/kenai/jnr/x86asm/LABEL_STATE.java b/src/main/java/com/kenai/jnr/x86asm/LABEL_STATE.java
similarity index 61%
copy from src/com/kenai/jnr/x86asm/LABEL_STATE.java
copy to src/main/java/com/kenai/jnr/x86asm/LABEL_STATE.java
index 62f78a6..81cc47c 100644
--- a/src/com/kenai/jnr/x86asm/LABEL_STATE.java
+++ b/src/main/java/com/kenai/jnr/x86asm/LABEL_STATE.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -44,6 +25,7 @@
package com.kenai.jnr.x86asm;
+ at Deprecated
public enum LABEL_STATE {
/** Label is unused. */
LABEL_STATE_UNUSED,
diff --git a/src/com/kenai/jnr/x86asm/Label.java b/src/main/java/com/kenai/jnr/x86asm/Label.java
similarity index 74%
copy from src/com/kenai/jnr/x86asm/Label.java
copy to src/main/java/com/kenai/jnr/x86asm/Label.java
index 9cbc71f..b2816df 100644
--- a/src/com/kenai/jnr/x86asm/Label.java
+++ b/src/main/java/com/kenai/jnr/x86asm/Label.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -51,6 +32,7 @@ import static com.kenai.jnr.x86asm.LABEL_STATE.*;
/**
*
*/
+ at Deprecated
public final class Label extends Operand {
/** Label Id (0 means unknown). */
diff --git a/src/com/kenai/jnr/x86asm/LinkData.java b/src/main/java/com/kenai/jnr/x86asm/LinkData.java
similarity index 64%
copy from src/com/kenai/jnr/x86asm/LinkData.java
copy to src/main/java/com/kenai/jnr/x86asm/LinkData.java
index 74cc31a..44b2b04 100644
--- a/src/com/kenai/jnr/x86asm/LinkData.java
+++ b/src/main/java/com/kenai/jnr/x86asm/LinkData.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -47,6 +28,7 @@ package com.kenai.jnr.x86asm;
/**
*
*/
+ at Deprecated
final class LinkData {
final int offset;
//! @brief Inlined displacement.
diff --git a/src/com/kenai/jnr/x86asm/RELOC_MODE.java b/src/main/java/com/kenai/jnr/x86asm/Logger.java
similarity index 50%
copy from src/com/kenai/jnr/x86asm/RELOC_MODE.java
copy to src/main/java/com/kenai/jnr/x86asm/Logger.java
index 39c2488..ddbe640 100644
--- a/src/com/kenai/jnr/x86asm/RELOC_MODE.java
+++ b/src/main/java/com/kenai/jnr/x86asm/Logger.java
@@ -1,25 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
-// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
+// Copyright (C) 2010 Wayne Meissner
//
// Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation
@@ -44,11 +24,11 @@
package com.kenai.jnr.x86asm;
-/** Relocation info */
-public enum RELOC_MODE {
- /** No relocation. */
- RELOC_NONE,
-
- /** Overwrite relocation (immediates as constants). */
- RELOC_OVERWRITE;
+/**
+ * Simple wrapper around logging
+ */
+ at Deprecated
+public class Logger {
+ public void log(String msg) {}
+ public void logAlign(long m) {}
}
diff --git a/src/com/kenai/jnr/x86asm/RELOC_MODE.java b/src/main/java/com/kenai/jnr/x86asm/MMRegister.java
similarity index 50%
copy from src/com/kenai/jnr/x86asm/RELOC_MODE.java
copy to src/main/java/com/kenai/jnr/x86asm/MMRegister.java
index 39c2488..49e1031 100644
--- a/src/com/kenai/jnr/x86asm/RELOC_MODE.java
+++ b/src/main/java/com/kenai/jnr/x86asm/MMRegister.java
@@ -1,25 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
-// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
+// Copyright (C) 2010 Wayne Meissner
//
// Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation
@@ -44,11 +24,26 @@
package com.kenai.jnr.x86asm;
-/** Relocation info */
-public enum RELOC_MODE {
- /** No relocation. */
- RELOC_NONE,
+ at Deprecated
+public final class MMRegister extends BaseReg {
+ /** Internal cache of mm registers */
+ static final MMRegister[] cache = new MMRegister[8];
+
+ static {
+ for (int i = 0; i < cache.length; ++i) {
+ cache[i] = new MMRegister(REG.REG_MM | i, 8);
+ }
+ }
+
+ private MMRegister(int code, int size) {
+ super(code, size);
+ }
+
+ public static final MMRegister mm(int code) {
+ if (code >= 0 && code < cache.length) {
+ return cache[code];
+ }
- /** Overwrite relocation (immediates as constants). */
- RELOC_OVERWRITE;
+ throw new IllegalArgumentException("invalid mm register");
+ }
}
diff --git a/src/com/kenai/jnr/x86asm/Mem.java b/src/main/java/com/kenai/jnr/x86asm/Mem.java
similarity index 98%
copy from src/com/kenai/jnr/x86asm/Mem.java
copy to src/main/java/com/kenai/jnr/x86asm/Mem.java
index 4b3275a..87ae6a8 100644
--- a/src/com/kenai/jnr/x86asm/Mem.java
+++ b/src/main/java/com/kenai/jnr/x86asm/Mem.java
@@ -1,3 +1,5 @@
+//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -29,6 +31,7 @@ import static com.kenai.jnr.x86asm.SEGMENT.*;
/**
*
*/
+ at Deprecated
public final class Mem extends Operand {
//! @brief Base register index, see @c REG.
private final int base;
diff --git a/src/com/kenai/jnr/x86asm/OP.java b/src/main/java/com/kenai/jnr/x86asm/OP.java
similarity index 66%
copy from src/com/kenai/jnr/x86asm/OP.java
copy to src/main/java/com/kenai/jnr/x86asm/OP.java
index dca2bc3..56d1c4e 100644
--- a/src/com/kenai/jnr/x86asm/OP.java
+++ b/src/main/java/com/kenai/jnr/x86asm/OP.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -45,6 +26,7 @@
package com.kenai.jnr.x86asm;
/** Operand types that can be encoded in <tt>Op</tt> operand */
+ at Deprecated
public final class OP {
/** Invalid operand */
public static final int OP_NONE = 0;
diff --git a/src/com/kenai/jnr/x86asm/Operand.java b/src/main/java/com/kenai/jnr/x86asm/Operand.java
similarity index 77%
copy from src/com/kenai/jnr/x86asm/Operand.java
copy to src/main/java/com/kenai/jnr/x86asm/Operand.java
index a64ecfa..475e2f2 100644
--- a/src/com/kenai/jnr/x86asm/Operand.java
+++ b/src/main/java/com/kenai/jnr/x86asm/Operand.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -46,6 +27,7 @@ package com.kenai.jnr.x86asm;
import static com.kenai.jnr.x86asm.OP.*;
+ at Deprecated
public class Operand {
private final int op;
private final int size;
diff --git a/src/com/kenai/jnr/x86asm/OperandFlags.java b/src/main/java/com/kenai/jnr/x86asm/OperandFlags.java
similarity index 72%
copy from src/com/kenai/jnr/x86asm/OperandFlags.java
copy to src/main/java/com/kenai/jnr/x86asm/OperandFlags.java
index 39b3bae..828b5e6 100644
--- a/src/com/kenai/jnr/x86asm/OperandFlags.java
+++ b/src/main/java/com/kenai/jnr/x86asm/OperandFlags.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -45,6 +26,7 @@
package com.kenai.jnr.x86asm;
+ at Deprecated
public class OperandFlags {
public static final int // x86
O_G8 = 0x01,
diff --git a/src/com/kenai/jnr/x86asm/PROPERTY.java b/src/main/java/com/kenai/jnr/x86asm/PROPERTY.java
similarity index 67%
copy from src/com/kenai/jnr/x86asm/PROPERTY.java
copy to src/main/java/com/kenai/jnr/x86asm/PROPERTY.java
index a778623..407b070 100644
--- a/src/com/kenai/jnr/x86asm/PROPERTY.java
+++ b/src/main/java/com/kenai/jnr/x86asm/PROPERTY.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -48,6 +29,7 @@ package com.kenai.jnr.x86asm;
/**
* Assembler/Compiler properties.
*/
+ at Deprecated
public final class PROPERTY {
/**
* Optimize align for current processor.
diff --git a/src/com/kenai/jnr/x86asm/REG.java b/src/main/java/com/kenai/jnr/x86asm/REG.java
similarity index 87%
copy from src/com/kenai/jnr/x86asm/REG.java
copy to src/main/java/com/kenai/jnr/x86asm/REG.java
index 0afafa7..de37b47 100644
--- a/src/com/kenai/jnr/x86asm/REG.java
+++ b/src/main/java/com/kenai/jnr/x86asm/REG.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -45,6 +26,7 @@
package com.kenai.jnr.x86asm;
+ at Deprecated
public class REG {
private REG() {}
//! @brief Mask for register type.
diff --git a/src/com/kenai/jnr/x86asm/RELOC_MODE.java b/src/main/java/com/kenai/jnr/x86asm/RELOC_MODE.java
similarity index 61%
copy from src/com/kenai/jnr/x86asm/RELOC_MODE.java
copy to src/main/java/com/kenai/jnr/x86asm/RELOC_MODE.java
index 39c2488..65f0206 100644
--- a/src/com/kenai/jnr/x86asm/RELOC_MODE.java
+++ b/src/main/java/com/kenai/jnr/x86asm/RELOC_MODE.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -45,6 +26,7 @@
package com.kenai.jnr.x86asm;
/** Relocation info */
+ at Deprecated
public enum RELOC_MODE {
/** No relocation. */
RELOC_NONE,
diff --git a/src/com/kenai/jnr/x86asm/RID.java b/src/main/java/com/kenai/jnr/x86asm/RID.java
similarity index 68%
copy from src/com/kenai/jnr/x86asm/RID.java
copy to src/main/java/com/kenai/jnr/x86asm/RID.java
index a324e44..77dcdd2 100644
--- a/src/com/kenai/jnr/x86asm/RID.java
+++ b/src/main/java/com/kenai/jnr/x86asm/RID.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -44,6 +25,7 @@
package com.kenai.jnr.x86asm;
+ at Deprecated
public class RID {
private RID() {
diff --git a/src/com/kenai/jnr/x86asm/Register.java b/src/main/java/com/kenai/jnr/x86asm/Register.java
similarity index 61%
copy from src/com/kenai/jnr/x86asm/Register.java
copy to src/main/java/com/kenai/jnr/x86asm/Register.java
index 03b83b2..d6c3f79 100644
--- a/src/com/kenai/jnr/x86asm/Register.java
+++ b/src/main/java/com/kenai/jnr/x86asm/Register.java
@@ -1,26 +1,33 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
+//
+// Copyright (C) 2010 Wayne Meissner
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
package com.kenai.jnr.x86asm;
import static com.kenai.jnr.x86asm.REG.*;
import static com.kenai.jnr.x86asm.SIZE.*;
+ at Deprecated
public final class Register extends BaseReg {
private static final Register[] gpb = new Register[16];
private static final Register[] gpw = new Register[16];
diff --git a/src/com/kenai/jnr/x86asm/RelocData.java b/src/main/java/com/kenai/jnr/x86asm/RelocData.java
similarity index 69%
copy from src/com/kenai/jnr/x86asm/RelocData.java
copy to src/main/java/com/kenai/jnr/x86asm/RelocData.java
index b940669..94dc3c0 100644
--- a/src/com/kenai/jnr/x86asm/RelocData.java
+++ b/src/main/java/com/kenai/jnr/x86asm/RelocData.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -47,6 +28,7 @@ package com.kenai.jnr.x86asm;
/**
* Reloc to absolute address data
*/
+ at Deprecated
class RelocData {
static enum Type {
diff --git a/src/com/kenai/jnr/x86asm/RELOC_MODE.java b/src/main/java/com/kenai/jnr/x86asm/SEGMENT.java
similarity index 50%
copy from src/com/kenai/jnr/x86asm/RELOC_MODE.java
copy to src/main/java/com/kenai/jnr/x86asm/SEGMENT.java
index 39c2488..a79e95f 100644
--- a/src/com/kenai/jnr/x86asm/RELOC_MODE.java
+++ b/src/main/java/com/kenai/jnr/x86asm/SEGMENT.java
@@ -1,25 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
-// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
+// Copyright (C) 2010 Wayne Meissner
//
// Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation
@@ -44,11 +24,21 @@
package com.kenai.jnr.x86asm;
-/** Relocation info */
-public enum RELOC_MODE {
- /** No relocation. */
- RELOC_NONE,
+/**
+ * Segment override prefixes.
+ */
+ at Deprecated
+public enum SEGMENT {
+ SEGMENT_NONE(0), SEGMENT_CS(0x2E), SEGMENT_SS(0x36),
+ SEGMENT_DS(0x3E), SEGMENT_ES(0x26), SEGMENT_FS(0x64), SEGMENT_GS(0x64);
+
+ private final int prefix;
+
+ SEGMENT(int prefix) {
+ this.prefix = prefix;
+ }
- /** Overwrite relocation (immediates as constants). */
- RELOC_OVERWRITE;
+ public final int prefix() {
+ return this.prefix;
+ }
}
diff --git a/src/com/kenai/jnr/x86asm/SIZE.java b/src/main/java/com/kenai/jnr/x86asm/SIZE.java
similarity index 66%
copy from src/com/kenai/jnr/x86asm/SIZE.java
copy to src/main/java/com/kenai/jnr/x86asm/SIZE.java
index 9c98de2..62a6c03 100644
--- a/src/com/kenai/jnr/x86asm/SIZE.java
+++ b/src/main/java/com/kenai/jnr/x86asm/SIZE.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -45,6 +26,7 @@
package com.kenai.jnr.x86asm;
/** Size of registers and pointers */
+ at Deprecated
public class SIZE {
/** 1 byte size. */
public static final int SIZE_BYTE = 1;
diff --git a/src/com/kenai/jnr/x86asm/Serializer.java b/src/main/java/com/kenai/jnr/x86asm/Serializer.java
similarity index 64%
copy from src/com/kenai/jnr/x86asm/Serializer.java
copy to src/main/java/com/kenai/jnr/x86asm/Serializer.java
index df99bb9..7281211 100644
--- a/src/com/kenai/jnr/x86asm/Serializer.java
+++ b/src/main/java/com/kenai/jnr/x86asm/Serializer.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -53,6 +34,7 @@ package com.kenai.jnr.x86asm;
* Always use this class and never use {@link SerializerCore} or {@link SerializerIntrinsics}
* classes directly.
*/
+ at Deprecated
public abstract class Serializer extends SerializerIntrinsics {
}
diff --git a/src/com/kenai/jnr/x86asm/SerializerCore.java b/src/main/java/com/kenai/jnr/x86asm/SerializerCore.java
similarity index 87%
copy from src/com/kenai/jnr/x86asm/SerializerCore.java
copy to src/main/java/com/kenai/jnr/x86asm/SerializerCore.java
index eaa5877..2931cac 100644
--- a/src/com/kenai/jnr/x86asm/SerializerCore.java
+++ b/src/main/java/com/kenai/jnr/x86asm/SerializerCore.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -61,6 +42,7 @@ import static com.kenai.jnr.x86asm.INST_CODE.*;
* to export them and {@link Serializer} class contains really huge count of
* symbols that will be never used (everything is inlined).
*/
+ at Deprecated
public abstract class SerializerCore {
static final Operand _none = new Operand(OP.OP_NONE, 0) {};
diff --git a/src/com/kenai/jnr/x86asm/SerializerIntrinsics.java b/src/main/java/com/kenai/jnr/x86asm/SerializerIntrinsics.java
similarity index 99%
copy from src/com/kenai/jnr/x86asm/SerializerIntrinsics.java
copy to src/main/java/com/kenai/jnr/x86asm/SerializerIntrinsics.java
index 79a647b..99a1327 100644
--- a/src/com/kenai/jnr/x86asm/SerializerIntrinsics.java
+++ b/src/main/java/com/kenai/jnr/x86asm/SerializerIntrinsics.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -50,6 +31,7 @@ import static com.kenai.jnr.x86asm.REG.*;
/**
* Assembler instruction serializer.
*/
+ at Deprecated
public abstract class SerializerIntrinsics extends SerializerCore {
// -------------------------------------------------------------------------
// [Embed]
diff --git a/src/com/kenai/jnr/x86asm/TrampolineWriter.java b/src/main/java/com/kenai/jnr/x86asm/TrampolineWriter.java
similarity index 68%
copy from src/com/kenai/jnr/x86asm/TrampolineWriter.java
copy to src/main/java/com/kenai/jnr/x86asm/TrampolineWriter.java
index 9b1f813..acc72b9 100644
--- a/src/com/kenai/jnr/x86asm/TrampolineWriter.java
+++ b/src/main/java/com/kenai/jnr/x86asm/TrampolineWriter.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -49,6 +30,7 @@ import java.nio.ByteBuffer;
/**
* Class used to determine size of trampoline and as trampoline writer.
*/
+ at Deprecated
final class TrampolineWriter {
// Size of trampoline
diff --git a/src/com/kenai/jnr/x86asm/Util.java b/src/main/java/com/kenai/jnr/x86asm/Util.java
similarity index 72%
copy from src/com/kenai/jnr/x86asm/Util.java
copy to src/main/java/com/kenai/jnr/x86asm/Util.java
index 79d1cee..edff968 100644
--- a/src/com/kenai/jnr/x86asm/Util.java
+++ b/src/main/java/com/kenai/jnr/x86asm/Util.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -47,6 +28,7 @@ package com.kenai.jnr.x86asm;
/**
*
*/
+ at Deprecated
public final class Util {
private Util() {
}
diff --git a/src/com/kenai/jnr/x86asm/RELOC_MODE.java b/src/main/java/com/kenai/jnr/x86asm/X87Register.java
similarity index 50%
copy from src/com/kenai/jnr/x86asm/RELOC_MODE.java
copy to src/main/java/com/kenai/jnr/x86asm/X87Register.java
index 39c2488..f280777 100644
--- a/src/com/kenai/jnr/x86asm/RELOC_MODE.java
+++ b/src/main/java/com/kenai/jnr/x86asm/X87Register.java
@@ -1,25 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
-// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
+// Copyright (C) 2010 Wayne Meissner
//
// Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation
@@ -44,11 +24,30 @@
package com.kenai.jnr.x86asm;
-/** Relocation info */
-public enum RELOC_MODE {
- /** No relocation. */
- RELOC_NONE,
+ at Deprecated
+public final class X87Register extends BaseReg {
+ /** Internal cache of xmm registers */
+ static final X87Register[] cache = new X87Register[16];
+
+ static {
+ for (int i = 0; i < cache.length; ++i) {
+ cache[i] = new X87Register(REG.REG_X87 | i, 10);
+ }
+ }
+
+ private X87Register(int code, int size) {
+ super(code, size);
+ }
+
+ public static final X87Register st(int idx) {
+ return x87(idx);
+ }
+
+ public static final X87Register x87(int idx) {
+ if (idx >= 0 && idx < cache.length) {
+ return cache[idx];
+ }
- /** Overwrite relocation (immediates as constants). */
- RELOC_OVERWRITE;
+ throw new IllegalArgumentException("invalid x87 register");
+ }
}
diff --git a/src/com/kenai/jnr/x86asm/RELOC_MODE.java b/src/main/java/com/kenai/jnr/x86asm/XMMRegister.java
similarity index 50%
copy from src/com/kenai/jnr/x86asm/RELOC_MODE.java
copy to src/main/java/com/kenai/jnr/x86asm/XMMRegister.java
index 39c2488..9e71f05 100644
--- a/src/com/kenai/jnr/x86asm/RELOC_MODE.java
+++ b/src/main/java/com/kenai/jnr/x86asm/XMMRegister.java
@@ -1,25 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
-// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
+// Copyright (C) 2010 Wayne Meissner
//
// Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation
@@ -44,11 +24,26 @@
package com.kenai.jnr.x86asm;
-/** Relocation info */
-public enum RELOC_MODE {
- /** No relocation. */
- RELOC_NONE,
+ at Deprecated
+public final class XMMRegister extends BaseReg {
+ /** Internal cache of xmm registers */
+ static final XMMRegister[] cache = new XMMRegister[16];
+
+ static {
+ for (int i = 0; i < cache.length; ++i) {
+ cache[i] = new XMMRegister(REG.REG_XMM | i, 16);
+ }
+ }
+
+ private XMMRegister(int code, int size) {
+ super(code, size);
+ }
+
+ public static final XMMRegister xmm(int idx) {
+ if (idx >= 0 && idx < cache.length) {
+ return cache[idx];
+ }
- /** Overwrite relocation (immediates as constants). */
- RELOC_OVERWRITE;
+ throw new IllegalArgumentException("invalid xmm register");
+ }
}
diff --git a/src/com/kenai/jnr/x86asm/Asm.java b/src/main/java/jnr/x86asm/Asm.java
similarity index 96%
rename from src/com/kenai/jnr/x86asm/Asm.java
rename to src/main/java/jnr/x86asm/Asm.java
index 3de88b1..3b40dd2 100644
--- a/src/com/kenai/jnr/x86asm/Asm.java
+++ b/src/main/java/jnr/x86asm/Asm.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,10 +23,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
-import static com.kenai.jnr.x86asm.REG.*;
-import static com.kenai.jnr.x86asm.SIZE.*;
+import static jnr.x86asm.REG.*;
+import static jnr.x86asm.SIZE.*;
public final class Asm {
private Asm() {}
diff --git a/src/com/kenai/jnr/x86asm/Assembler.java b/src/main/java/jnr/x86asm/Assembler.java
similarity index 97%
rename from src/com/kenai/jnr/x86asm/Assembler.java
rename to src/main/java/jnr/x86asm/Assembler.java
index 5e682a3..95fc2d7 100644
--- a/src/com/kenai/jnr/x86asm/Assembler.java
+++ b/src/main/java/jnr/x86asm/Assembler.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,21 +23,21 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
import java.nio.ByteBuffer;
import java.util.LinkedList;
import java.util.List;
-import static com.kenai.jnr.x86asm.HINT.*;
-import static com.kenai.jnr.x86asm.INST_CODE.*;
-import static com.kenai.jnr.x86asm.InstructionGroup.*;
-import static com.kenai.jnr.x86asm.OP.*;
-import static com.kenai.jnr.x86asm.OperandFlags.*;
-import static com.kenai.jnr.x86asm.PROPERTY.*;
-import static com.kenai.jnr.x86asm.RELOC_MODE.*;
-import static com.kenai.jnr.x86asm.REG.*;
-
-import static com.kenai.jnr.x86asm.Util.*;
+import static jnr.x86asm.HINT.*;
+import static jnr.x86asm.INST_CODE.*;
+import static jnr.x86asm.InstructionGroup.*;
+import static jnr.x86asm.OP.*;
+import static jnr.x86asm.OperandFlags.*;
+import static jnr.x86asm.PROPERTY.*;
+import static jnr.x86asm.RELOC_MODE.*;
+import static jnr.x86asm.REG.*;
+
+import static jnr.x86asm.Util.*;
/**
diff --git a/src/com/kenai/jnr/x86asm/BaseReg.java b/src/main/java/jnr/x86asm/BaseReg.java
similarity index 67%
rename from src/com/kenai/jnr/x86asm/BaseReg.java
rename to src/main/java/jnr/x86asm/BaseReg.java
index 1d5cb59..cbf907b 100644
--- a/src/com/kenai/jnr/x86asm/BaseReg.java
+++ b/src/main/java/jnr/x86asm/BaseReg.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -41,9 +22,9 @@
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
-import static com.kenai.jnr.x86asm.REG.*;
+import static jnr.x86asm.REG.*;
public abstract class BaseReg extends Operand {
diff --git a/src/com/kenai/jnr/x86asm/CONDITION.java b/src/main/java/jnr/x86asm/CONDITION.java
similarity index 75%
rename from src/com/kenai/jnr/x86asm/CONDITION.java
rename to src/main/java/jnr/x86asm/CONDITION.java
index 42e43a3..2409faf 100644
--- a/src/com/kenai/jnr/x86asm/CONDITION.java
+++ b/src/main/java/jnr/x86asm/CONDITION.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,7 +23,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
/**
*
diff --git a/src/main/java/jnr/x86asm/CPU.java b/src/main/java/jnr/x86asm/CPU.java
new file mode 100644
index 0000000..95ea13e
--- /dev/null
+++ b/src/main/java/jnr/x86asm/CPU.java
@@ -0,0 +1,31 @@
+//
+// Copyright (C) 2010 Wayne Meissner
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+package jnr.x86asm;
+
+
+public enum CPU {
+ X86_32, X86_64;
+ public static final CPU I386 = X86_32;
+}
diff --git a/src/com/kenai/jnr/x86asm/CodeBuffer.java b/src/main/java/jnr/x86asm/CodeBuffer.java
similarity index 64%
rename from src/com/kenai/jnr/x86asm/CodeBuffer.java
rename to src/main/java/jnr/x86asm/CodeBuffer.java
index d6686fa..37c580b 100644
--- a/src/com/kenai/jnr/x86asm/CodeBuffer.java
+++ b/src/main/java/jnr/x86asm/CodeBuffer.java
@@ -1,22 +1,28 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
+//
+// Copyright (C) 2010 Wayne Meissner
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
diff --git a/src/main/java/jnr/x86asm/CpuInfo.java b/src/main/java/jnr/x86asm/CpuInfo.java
new file mode 100644
index 0000000..21832cd
--- /dev/null
+++ b/src/main/java/jnr/x86asm/CpuInfo.java
@@ -0,0 +1,47 @@
+//
+// Copyright (C) 2010 Wayne Meissner
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+package jnr.x86asm;
+
+/**
+ * Information about target CPU
+ */
+public class CpuInfo {
+
+ final Vendor vendor;
+ final int family;
+
+ public enum Vendor {
+ INTEL,
+ AMD,
+ GENERIC;
+ }
+
+ public static final CpuInfo GENERIC = new CpuInfo(Vendor.GENERIC, 0);
+
+ public CpuInfo(Vendor vendor, int family) {
+ this.vendor = vendor;
+ this.family = family;
+ }
+}
diff --git a/src/com/kenai/jnr/x86asm/ERROR_CODE.java b/src/main/java/jnr/x86asm/ERROR_CODE.java
similarity index 71%
rename from src/com/kenai/jnr/x86asm/ERROR_CODE.java
rename to src/main/java/jnr/x86asm/ERROR_CODE.java
index d8ecb4f..54053e3 100644
--- a/src/com/kenai/jnr/x86asm/ERROR_CODE.java
+++ b/src/main/java/jnr/x86asm/ERROR_CODE.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,7 +23,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
public enum ERROR_CODE {
diff --git a/src/com/kenai/jnr/x86asm/HINT.java b/src/main/java/jnr/x86asm/HINT.java
similarity index 67%
rename from src/com/kenai/jnr/x86asm/HINT.java
rename to src/main/java/jnr/x86asm/HINT.java
index 622de41..a69d9f8 100644
--- a/src/com/kenai/jnr/x86asm/HINT.java
+++ b/src/main/java/jnr/x86asm/HINT.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -43,7 +24,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
/**
* Condition hint, see @c AsmJit::Serializer::jz() and friends.
diff --git a/src/com/kenai/jnr/x86asm/INST_CODE.java b/src/main/java/jnr/x86asm/INST_CODE.java
similarity index 95%
rename from src/com/kenai/jnr/x86asm/INST_CODE.java
rename to src/main/java/jnr/x86asm/INST_CODE.java
index 6154621..e428b17 100644
--- a/src/com/kenai/jnr/x86asm/INST_CODE.java
+++ b/src/main/java/jnr/x86asm/INST_CODE.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,7 +23,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
public enum INST_CODE {
diff --git a/src/com/kenai/jnr/x86asm/Immediate.java b/src/main/java/jnr/x86asm/Immediate.java
similarity index 75%
rename from src/com/kenai/jnr/x86asm/Immediate.java
rename to src/main/java/jnr/x86asm/Immediate.java
index d30c0eb..7912bfa 100644
--- a/src/com/kenai/jnr/x86asm/Immediate.java
+++ b/src/main/java/jnr/x86asm/Immediate.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,7 +23,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
/**
*
diff --git a/src/com/kenai/jnr/x86asm/InstructionDescription.java b/src/main/java/jnr/x86asm/InstructionDescription.java
similarity index 98%
rename from src/com/kenai/jnr/x86asm/InstructionDescription.java
rename to src/main/java/jnr/x86asm/InstructionDescription.java
index f7228b7..20b5276 100644
--- a/src/com/kenai/jnr/x86asm/InstructionDescription.java
+++ b/src/main/java/jnr/x86asm/InstructionDescription.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -43,13 +24,13 @@
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
import java.util.EnumMap;
import java.util.Map;
-import static com.kenai.jnr.x86asm.INST_CODE.*;
-import static com.kenai.jnr.x86asm.InstructionGroup.*;
-import static com.kenai.jnr.x86asm.OperandFlags.*;
+import static jnr.x86asm.INST_CODE.*;
+import static jnr.x86asm.InstructionGroup.*;
+import static jnr.x86asm.OperandFlags.*;
public final class InstructionDescription {
final INST_CODE code;
@@ -66,7 +47,7 @@ public final class InstructionDescription {
private static final InstructionDescription MAKE_INST(INST_CODE code, String name,
InstructionGroup group, int of1, int of2, int r, int op1, int op2) {
- InstructionDescription id = new InstructionDescription(code, name, group, of2, of2, r, op1, op2);
+ InstructionDescription id = new InstructionDescription(code, name, group, of1, of2, r, op1, op2);
table.put(code, id);
return id;
}
diff --git a/src/com/kenai/jnr/x86asm/InstructionGroup.java b/src/main/java/jnr/x86asm/InstructionGroup.java
similarity index 77%
rename from src/com/kenai/jnr/x86asm/InstructionGroup.java
rename to src/main/java/jnr/x86asm/InstructionGroup.java
index bc5b466..c0d9723 100644
--- a/src/com/kenai/jnr/x86asm/InstructionGroup.java
+++ b/src/main/java/jnr/x86asm/InstructionGroup.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,7 +23,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
public enum InstructionGroup {
diff --git a/src/com/kenai/jnr/x86asm/LABEL_STATE.java b/src/main/java/jnr/x86asm/LABEL_STATE.java
similarity index 60%
rename from src/com/kenai/jnr/x86asm/LABEL_STATE.java
rename to src/main/java/jnr/x86asm/LABEL_STATE.java
index 62f78a6..852e9ba 100644
--- a/src/com/kenai/jnr/x86asm/LABEL_STATE.java
+++ b/src/main/java/jnr/x86asm/LABEL_STATE.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,7 +23,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
public enum LABEL_STATE {
/** Label is unused. */
diff --git a/src/com/kenai/jnr/x86asm/Label.java b/src/main/java/jnr/x86asm/Label.java
similarity index 71%
rename from src/com/kenai/jnr/x86asm/Label.java
rename to src/main/java/jnr/x86asm/Label.java
index 9cbc71f..2e4864f 100644
--- a/src/com/kenai/jnr/x86asm/Label.java
+++ b/src/main/java/jnr/x86asm/Label.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,11 +23,11 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
import java.util.LinkedList;
import java.util.List;
-import static com.kenai.jnr.x86asm.LABEL_STATE.*;
+import static jnr.x86asm.LABEL_STATE.*;
/**
*
diff --git a/src/com/kenai/jnr/x86asm/LinkData.java b/src/main/java/jnr/x86asm/LinkData.java
similarity index 63%
rename from src/com/kenai/jnr/x86asm/LinkData.java
rename to src/main/java/jnr/x86asm/LinkData.java
index 74cc31a..f0b84bb 100644
--- a/src/com/kenai/jnr/x86asm/LinkData.java
+++ b/src/main/java/jnr/x86asm/LinkData.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,7 +23,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
/**
*
diff --git a/src/main/java/jnr/x86asm/Logger.java b/src/main/java/jnr/x86asm/Logger.java
new file mode 100644
index 0000000..f926d14
--- /dev/null
+++ b/src/main/java/jnr/x86asm/Logger.java
@@ -0,0 +1,33 @@
+//
+// Copyright (C) 2010 Wayne Meissner
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+package jnr.x86asm;
+
+/**
+ * Simple wrapper around logging
+ */
+public class Logger {
+ public void log(String msg) {}
+ public void logAlign(long m) {}
+}
diff --git a/src/main/java/jnr/x86asm/MMRegister.java b/src/main/java/jnr/x86asm/MMRegister.java
new file mode 100644
index 0000000..3e09b3c
--- /dev/null
+++ b/src/main/java/jnr/x86asm/MMRegister.java
@@ -0,0 +1,48 @@
+//
+// Copyright (C) 2010 Wayne Meissner
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+package jnr.x86asm;
+
+public final class MMRegister extends BaseReg {
+ /** Internal cache of mm registers */
+ static final MMRegister[] cache = new MMRegister[8];
+
+ static {
+ for (int i = 0; i < cache.length; ++i) {
+ cache[i] = new MMRegister(REG.REG_MM | i, 8);
+ }
+ }
+
+ private MMRegister(int code, int size) {
+ super(code, size);
+ }
+
+ public static final MMRegister mm(int code) {
+ if (code >= 0 && code < cache.length) {
+ return cache[code];
+ }
+
+ throw new IllegalArgumentException("invalid mm register");
+ }
+}
diff --git a/src/com/kenai/jnr/x86asm/Mem.java b/src/main/java/jnr/x86asm/Mem.java
similarity index 96%
rename from src/com/kenai/jnr/x86asm/Mem.java
rename to src/main/java/jnr/x86asm/Mem.java
index 4b3275a..dd45550 100644
--- a/src/com/kenai/jnr/x86asm/Mem.java
+++ b/src/main/java/jnr/x86asm/Mem.java
@@ -1,3 +1,5 @@
+//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -21,10 +23,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
-import static com.kenai.jnr.x86asm.REG.*;
-import static com.kenai.jnr.x86asm.SEGMENT.*;
+import static jnr.x86asm.REG.*;
+import static jnr.x86asm.SEGMENT.*;
/**
*
diff --git a/src/com/kenai/jnr/x86asm/OP.java b/src/main/java/jnr/x86asm/OP.java
similarity index 65%
rename from src/com/kenai/jnr/x86asm/OP.java
rename to src/main/java/jnr/x86asm/OP.java
index dca2bc3..6a596e1 100644
--- a/src/com/kenai/jnr/x86asm/OP.java
+++ b/src/main/java/jnr/x86asm/OP.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,7 +23,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
/** Operand types that can be encoded in <tt>Op</tt> operand */
public final class OP {
diff --git a/src/com/kenai/jnr/x86asm/Operand.java b/src/main/java/jnr/x86asm/Operand.java
similarity index 75%
rename from src/com/kenai/jnr/x86asm/Operand.java
rename to src/main/java/jnr/x86asm/Operand.java
index a64ecfa..7c7f640 100644
--- a/src/com/kenai/jnr/x86asm/Operand.java
+++ b/src/main/java/jnr/x86asm/Operand.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,9 +23,9 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
-import static com.kenai.jnr.x86asm.OP.*;
+import static jnr.x86asm.OP.*;
public class Operand {
private final int op;
diff --git a/src/com/kenai/jnr/x86asm/OperandFlags.java b/src/main/java/jnr/x86asm/OperandFlags.java
similarity index 71%
rename from src/com/kenai/jnr/x86asm/OperandFlags.java
rename to src/main/java/jnr/x86asm/OperandFlags.java
index 39b3bae..b21c2a1 100644
--- a/src/com/kenai/jnr/x86asm/OperandFlags.java
+++ b/src/main/java/jnr/x86asm/OperandFlags.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -43,7 +24,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
public class OperandFlags {
public static final int // x86
diff --git a/src/com/kenai/jnr/x86asm/PROPERTY.java b/src/main/java/jnr/x86asm/PROPERTY.java
similarity index 65%
rename from src/com/kenai/jnr/x86asm/PROPERTY.java
rename to src/main/java/jnr/x86asm/PROPERTY.java
index a778623..bcff46e 100644
--- a/src/com/kenai/jnr/x86asm/PROPERTY.java
+++ b/src/main/java/jnr/x86asm/PROPERTY.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -43,7 +24,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
/**
* Assembler/Compiler properties.
diff --git a/src/com/kenai/jnr/x86asm/REG.java b/src/main/java/jnr/x86asm/REG.java
similarity index 86%
rename from src/com/kenai/jnr/x86asm/REG.java
rename to src/main/java/jnr/x86asm/REG.java
index 0afafa7..5d94f98 100644
--- a/src/com/kenai/jnr/x86asm/REG.java
+++ b/src/main/java/jnr/x86asm/REG.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -43,7 +24,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
public class REG {
private REG() {}
diff --git a/src/com/kenai/jnr/x86asm/RELOC_MODE.java b/src/main/java/jnr/x86asm/RELOC_MODE.java
similarity index 59%
rename from src/com/kenai/jnr/x86asm/RELOC_MODE.java
rename to src/main/java/jnr/x86asm/RELOC_MODE.java
index 39c2488..720afe6 100644
--- a/src/com/kenai/jnr/x86asm/RELOC_MODE.java
+++ b/src/main/java/jnr/x86asm/RELOC_MODE.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,7 +23,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
/** Relocation info */
public enum RELOC_MODE {
diff --git a/src/com/kenai/jnr/x86asm/RID.java b/src/main/java/jnr/x86asm/RID.java
similarity index 67%
rename from src/com/kenai/jnr/x86asm/RID.java
rename to src/main/java/jnr/x86asm/RID.java
index a324e44..b25d7aa 100644
--- a/src/com/kenai/jnr/x86asm/RID.java
+++ b/src/main/java/jnr/x86asm/RID.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,7 +23,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
public class RID {
diff --git a/src/com/kenai/jnr/x86asm/Register.java b/src/main/java/jnr/x86asm/Register.java
similarity index 58%
rename from src/com/kenai/jnr/x86asm/Register.java
rename to src/main/java/jnr/x86asm/Register.java
index 03b83b2..613f153 100644
--- a/src/com/kenai/jnr/x86asm/Register.java
+++ b/src/main/java/jnr/x86asm/Register.java
@@ -1,25 +1,31 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.kenai.jnr.x86asm;
-
-import static com.kenai.jnr.x86asm.REG.*;
-import static com.kenai.jnr.x86asm.SIZE.*;
+//
+// Copyright (C) 2010 Wayne Meissner
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+package jnr.x86asm;
+
+import static jnr.x86asm.REG.*;
+import static jnr.x86asm.SIZE.*;
public final class Register extends BaseReg {
private static final Register[] gpb = new Register[16];
diff --git a/src/com/kenai/jnr/x86asm/RelocData.java b/src/main/java/jnr/x86asm/RelocData.java
similarity index 68%
rename from src/com/kenai/jnr/x86asm/RelocData.java
rename to src/main/java/jnr/x86asm/RelocData.java
index b940669..243f39a 100644
--- a/src/com/kenai/jnr/x86asm/RelocData.java
+++ b/src/main/java/jnr/x86asm/RelocData.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,7 +23,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
/**
* Reloc to absolute address data
diff --git a/src/main/java/jnr/x86asm/SEGMENT.java b/src/main/java/jnr/x86asm/SEGMENT.java
new file mode 100644
index 0000000..6b5112c
--- /dev/null
+++ b/src/main/java/jnr/x86asm/SEGMENT.java
@@ -0,0 +1,43 @@
+//
+// Copyright (C) 2010 Wayne Meissner
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+package jnr.x86asm;
+
+/**
+ * Segment override prefixes.
+ */
+public enum SEGMENT {
+ SEGMENT_NONE(0), SEGMENT_CS(0x2E), SEGMENT_SS(0x36),
+ SEGMENT_DS(0x3E), SEGMENT_ES(0x26), SEGMENT_FS(0x64), SEGMENT_GS(0x64);
+
+ private final int prefix;
+
+ SEGMENT(int prefix) {
+ this.prefix = prefix;
+ }
+
+ public final int prefix() {
+ return this.prefix;
+ }
+}
diff --git a/src/com/kenai/jnr/x86asm/SIZE.java b/src/main/java/jnr/x86asm/SIZE.java
similarity index 64%
rename from src/com/kenai/jnr/x86asm/SIZE.java
rename to src/main/java/jnr/x86asm/SIZE.java
index 9c98de2..7bcab8b 100644
--- a/src/com/kenai/jnr/x86asm/SIZE.java
+++ b/src/main/java/jnr/x86asm/SIZE.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,7 +23,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
/** Size of registers and pointers */
public class SIZE {
diff --git a/src/com/kenai/jnr/x86asm/Serializer.java b/src/main/java/jnr/x86asm/Serializer.java
similarity index 63%
rename from src/com/kenai/jnr/x86asm/Serializer.java
rename to src/main/java/jnr/x86asm/Serializer.java
index df99bb9..648d4bb 100644
--- a/src/com/kenai/jnr/x86asm/Serializer.java
+++ b/src/main/java/jnr/x86asm/Serializer.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,7 +23,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
/**
* Assembler instruction serializer.
diff --git a/src/com/kenai/jnr/x86asm/SerializerCore.java b/src/main/java/jnr/x86asm/SerializerCore.java
similarity index 86%
rename from src/com/kenai/jnr/x86asm/SerializerCore.java
rename to src/main/java/jnr/x86asm/SerializerCore.java
index eaa5877..1ca63ca 100644
--- a/src/com/kenai/jnr/x86asm/SerializerCore.java
+++ b/src/main/java/jnr/x86asm/SerializerCore.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,9 +23,9 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
-import static com.kenai.jnr.x86asm.INST_CODE.*;
+import static jnr.x86asm.INST_CODE.*;
/**
* Assembler intrinsics seralizer.
diff --git a/src/com/kenai/jnr/x86asm/SerializerIntrinsics.java b/src/main/java/jnr/x86asm/SerializerIntrinsics.java
similarity index 99%
rename from src/com/kenai/jnr/x86asm/SerializerIntrinsics.java
rename to src/main/java/jnr/x86asm/SerializerIntrinsics.java
index 79a647b..c3ae9fb 100644
--- a/src/com/kenai/jnr/x86asm/SerializerIntrinsics.java
+++ b/src/main/java/jnr/x86asm/SerializerIntrinsics.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,10 +23,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
-import static com.kenai.jnr.x86asm.INST_CODE.*;
-import static com.kenai.jnr.x86asm.REG.*;
+import static jnr.x86asm.INST_CODE.*;
+import static jnr.x86asm.REG.*;
/**
* Assembler instruction serializer.
diff --git a/src/com/kenai/jnr/x86asm/TrampolineWriter.java b/src/main/java/jnr/x86asm/TrampolineWriter.java
similarity index 67%
rename from src/com/kenai/jnr/x86asm/TrampolineWriter.java
rename to src/main/java/jnr/x86asm/TrampolineWriter.java
index 9b1f813..1484be7 100644
--- a/src/com/kenai/jnr/x86asm/TrampolineWriter.java
+++ b/src/main/java/jnr/x86asm/TrampolineWriter.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,7 +23,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
import java.nio.ByteBuffer;
diff --git a/src/com/kenai/jnr/x86asm/Util.java b/src/main/java/jnr/x86asm/Util.java
similarity index 71%
rename from src/com/kenai/jnr/x86asm/Util.java
rename to src/main/java/jnr/x86asm/Util.java
index 79d1cee..fd42d90 100644
--- a/src/com/kenai/jnr/x86asm/Util.java
+++ b/src/main/java/jnr/x86asm/Util.java
@@ -1,24 +1,5 @@
-/*
- * Copyright (C) 2010 Wayne Meissner
- *
- * This file is part of jnr-x86asm.
- *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// While jnr-x86asm is covered under the LGPL version 3 as state above, it is based
-// on code from the AsmJit project, and that copyright is reproduced below.
//
+// Copyright (C) 2010 Wayne Meissner
// Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr at gmail.com>
//
// Permission is hereby granted, free of charge, to any person
@@ -42,7 +23,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
-package com.kenai.jnr.x86asm;
+package jnr.x86asm;
/**
*
diff --git a/src/main/java/jnr/x86asm/X87Register.java b/src/main/java/jnr/x86asm/X87Register.java
new file mode 100644
index 0000000..6383462
--- /dev/null
+++ b/src/main/java/jnr/x86asm/X87Register.java
@@ -0,0 +1,52 @@
+//
+// Copyright (C) 2010 Wayne Meissner
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+package jnr.x86asm;
+
+public final class X87Register extends BaseReg {
+ /** Internal cache of xmm registers */
+ static final X87Register[] cache = new X87Register[16];
+
+ static {
+ for (int i = 0; i < cache.length; ++i) {
+ cache[i] = new X87Register(REG.REG_X87 | i, 10);
+ }
+ }
+
+ private X87Register(int code, int size) {
+ super(code, size);
+ }
+
+ public static final X87Register st(int idx) {
+ return x87(idx);
+ }
+
+ public static final X87Register x87(int idx) {
+ if (idx >= 0 && idx < cache.length) {
+ return cache[idx];
+ }
+
+ throw new IllegalArgumentException("invalid x87 register");
+ }
+}
diff --git a/src/main/java/jnr/x86asm/XMMRegister.java b/src/main/java/jnr/x86asm/XMMRegister.java
new file mode 100644
index 0000000..b5640fe
--- /dev/null
+++ b/src/main/java/jnr/x86asm/XMMRegister.java
@@ -0,0 +1,48 @@
+//
+// Copyright (C) 2010 Wayne Meissner
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+package jnr.x86asm;
+
+public final class XMMRegister extends BaseReg {
+ /** Internal cache of xmm registers */
+ static final XMMRegister[] cache = new XMMRegister[16];
+
+ static {
+ for (int i = 0; i < cache.length; ++i) {
+ cache[i] = new XMMRegister(REG.REG_XMM | i, 16);
+ }
+ }
+
+ private XMMRegister(int code, int size) {
+ super(code, size);
+ }
+
+ public static final XMMRegister xmm(int idx) {
+ if (idx >= 0 && idx < cache.length) {
+ return cache[idx];
+ }
+
+ throw new IllegalArgumentException("invalid xmm register");
+ }
+}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jnr-x86asm.git
More information about the pkg-java-commits
mailing list