From 5b62b87b5557e5e57e93e4d4f35e6372e985b4db Mon Sep 17 00:00:00 2001 From: Ryan Jones-Ward Date: Thu, 18 Jul 2024 11:51:56 +0100 Subject: [PATCH 01/10] Correctly mark data labels as data labels. --- redox-core/src/compiling/compiler.rs | 5 ++++- redox-terminal/src/main.rs | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/redox-core/src/compiling/compiler.rs b/redox-core/src/compiling/compiler.rs index 104c0c8..a03eb10 100644 --- a/redox-core/src/compiling/compiler.rs +++ b/redox-core/src/compiling/compiler.rs @@ -27,6 +27,7 @@ impl Compiler { } } + #[inline] fn assert_label_does_not_exist(&self, label: &String) { assert!( !self.labels.contains_key(label), @@ -73,6 +74,8 @@ impl Compiler { // Now load the code labels. self.load_code_labels(&instructions); + println!("labels = {:?}", self.labels); + if optimize { // TODO - optimizations should go here. // TODO - an optimization here might be to use a short call/jump instruction @@ -137,7 +140,7 @@ impl Compiler { self.labels.insert( d.label.clone(), - LabelEntry::new(LabelType::Code, d.label.clone(), position), + LabelEntry::new(LabelType::Data, d.label.clone(), position), ); position += d.bytes.len(); diff --git a/redox-terminal/src/main.rs b/redox-terminal/src/main.rs index 6ec3234..ee34354 100644 --- a/redox-terminal/src/main.rs +++ b/redox-terminal/src/main.rs @@ -66,7 +66,9 @@ fn main() { panic!("currently unsupported"); } - let code = "section .text + let code = "section .data + test db 'bananas' + section .text push 0 call :LABEL_1 hlt From b713f2af281eb9707332c47d2c9f6ae4bd81b523 Mon Sep 17 00:00:00 2001 From: Ryan Jones-Ward Date: Thu, 18 Jul 2024 12:00:14 +0100 Subject: [PATCH 02/10] Add some license files and ensure the TOML paths correctly point to them. --- README.md | 2 +- redox-core/Cargo.toml | 3 +- redox-core/LICENSE | 504 ++++++++++++++++++++++++++++++++++++++ redox-core/README.md | 2 + redox-terminal/Cargo.toml | 2 + redox-terminal/LICENSE | 504 ++++++++++++++++++++++++++++++++++++++ redox-terminal/README.md | 2 + 7 files changed, 1017 insertions(+), 2 deletions(-) create mode 100644 redox-core/LICENSE create mode 100644 redox-core/README.md create mode 100644 redox-terminal/LICENSE create mode 100644 redox-terminal/README.md diff --git a/README.md b/README.md index 4933a20..f4bf91c 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# redox +# Redox A new toy virtual machine, assembler and compiler, written in Rust. diff --git a/redox-core/Cargo.toml b/redox-core/Cargo.toml index d0b0207..57c2b73 100644 --- a/redox-core/Cargo.toml +++ b/redox-core/Cargo.toml @@ -4,8 +4,9 @@ version = "0.1.0" authors = ["Ryan Jones-Ward "] edition = "2021" readme = "README.md" +license = "LGPL-2.1-only" +license-file = "LICENSE" description = "A new toy virtual machine, assembler and compiler, written in Rust." -license_file = "LICENSE" repository = "https://github.com/sciguyryan/Redox" homepage = "https://github.com/sciguyryan/Redox" diff --git a/redox-core/LICENSE b/redox-core/LICENSE new file mode 100644 index 0000000..8000a6f --- /dev/null +++ b/redox-core/LICENSE @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +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 this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. 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 not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the 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 +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random + Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/redox-core/README.md b/redox-core/README.md new file mode 100644 index 0000000..af40bdb --- /dev/null +++ b/redox-core/README.md @@ -0,0 +1,2 @@ +# Redox Core +A toy virtual machine, assembler and compiler, written in Rust. diff --git a/redox-terminal/Cargo.toml b/redox-terminal/Cargo.toml index c08c00e..d5d78c8 100644 --- a/redox-terminal/Cargo.toml +++ b/redox-terminal/Cargo.toml @@ -4,6 +4,8 @@ version = "0.1.0" authors = ["Ryan Jones-Ward "] edition = "2021" readme = "README.md" +license = "LGPL-2.1-only" +license-file = "LICENSE" description = "A testing terminal for Redox" repository = "https://github.com/sciguyryan/Redox" homepage = "https://github.com/sciguyryan/Redox" diff --git a/redox-terminal/LICENSE b/redox-terminal/LICENSE new file mode 100644 index 0000000..8000a6f --- /dev/null +++ b/redox-terminal/LICENSE @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +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 this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. 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 not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the 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 +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random + Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/redox-terminal/README.md b/redox-terminal/README.md new file mode 100644 index 0000000..f1558f2 --- /dev/null +++ b/redox-terminal/README.md @@ -0,0 +1,2 @@ +# Redox Terminal +A terminal for testing the Redox virtual machine. \ No newline at end of file From 293cb1e29b497e7bfdcac0d916a468d7ff193c41 Mon Sep 17 00:00:00 2001 From: Ryan Jones-Ward Date: Thu, 18 Jul 2024 12:08:30 +0100 Subject: [PATCH 03/10] Clean up some things that are no longer used. --- redox-core/Cargo.toml | 1 - redox-core/LICENSE | 504 -------------------------- redox-core/README.md | 2 - redox-core/src/ins/jump_expression.rs | 9 - redox-core/src/ins/mod.rs | 1 - redox-terminal/Cargo.toml | 2 - redox-terminal/LICENSE | 504 -------------------------- redox-terminal/README.md | 2 - 8 files changed, 1025 deletions(-) delete mode 100644 redox-core/LICENSE delete mode 100644 redox-core/README.md delete mode 100644 redox-core/src/ins/jump_expression.rs delete mode 100644 redox-terminal/LICENSE delete mode 100644 redox-terminal/README.md diff --git a/redox-core/Cargo.toml b/redox-core/Cargo.toml index 57c2b73..e267938 100644 --- a/redox-core/Cargo.toml +++ b/redox-core/Cargo.toml @@ -5,7 +5,6 @@ authors = ["Ryan Jones-Ward "] edition = "2021" readme = "README.md" license = "LGPL-2.1-only" -license-file = "LICENSE" description = "A new toy virtual machine, assembler and compiler, written in Rust." repository = "https://github.com/sciguyryan/Redox" homepage = "https://github.com/sciguyryan/Redox" diff --git a/redox-core/LICENSE b/redox-core/LICENSE deleted file mode 100644 index 8000a6f..0000000 --- a/redox-core/LICENSE +++ /dev/null @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -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 this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. 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 not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -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 -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the 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 -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "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 -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY 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 -LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random - Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/redox-core/README.md b/redox-core/README.md deleted file mode 100644 index af40bdb..0000000 --- a/redox-core/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# Redox Core -A toy virtual machine, assembler and compiler, written in Rust. diff --git a/redox-core/src/ins/jump_expression.rs b/redox-core/src/ins/jump_expression.rs deleted file mode 100644 index 5908ff1..0000000 --- a/redox-core/src/ins/jump_expression.rs +++ /dev/null @@ -1,9 +0,0 @@ -use crate::reg::registers::RegisterId; - -#[derive(Clone, Debug)] -pub struct JumpExpression { - /// The base register ID associated with this expression. - pub base_register: RegisterId, - /// The 32-bit value by which the value of the specific register should be offset in the jump. - pub offset: u32, -} diff --git a/redox-core/src/ins/mod.rs b/redox-core/src/ins/mod.rs index 82eabdc..a8d8d80 100644 --- a/redox-core/src/ins/mod.rs +++ b/redox-core/src/ins/mod.rs @@ -1,4 +1,3 @@ pub mod expression; pub mod instruction; -pub mod jump_expression; pub mod op_codes; diff --git a/redox-terminal/Cargo.toml b/redox-terminal/Cargo.toml index d5d78c8..0a76c6c 100644 --- a/redox-terminal/Cargo.toml +++ b/redox-terminal/Cargo.toml @@ -3,9 +3,7 @@ name = "redox_terminal" version = "0.1.0" authors = ["Ryan Jones-Ward "] edition = "2021" -readme = "README.md" license = "LGPL-2.1-only" -license-file = "LICENSE" description = "A testing terminal for Redox" repository = "https://github.com/sciguyryan/Redox" homepage = "https://github.com/sciguyryan/Redox" diff --git a/redox-terminal/LICENSE b/redox-terminal/LICENSE deleted file mode 100644 index 8000a6f..0000000 --- a/redox-terminal/LICENSE +++ /dev/null @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -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 this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. 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 not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -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 -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the 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 -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "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 -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY 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 -LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random - Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/redox-terminal/README.md b/redox-terminal/README.md deleted file mode 100644 index f1558f2..0000000 --- a/redox-terminal/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# Redox Terminal -A terminal for testing the Redox virtual machine. \ No newline at end of file From bd91fb98f7a28c2a54328bac78fbf3f637afb173 Mon Sep 17 00:00:00 2001 From: Ryan Jones-Ward Date: Thu, 18 Jul 2024 12:14:38 +0100 Subject: [PATCH 04/10] Rename some instruction mnemonics. --- redox-core/src/ins/instruction.rs | 8 ++++---- redox-core/src/parsing/type_hints.rs | 6 +++--- redox-terminal/src/main.rs | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/redox-core/src/ins/instruction.rs b/redox-core/src/ins/instruction.rs index 213e596..d78ec5d 100644 --- a/redox-core/src/ins/instruction.rs +++ b/redox-core/src/ins/instruction.rs @@ -289,16 +289,16 @@ impl Display for Instruction { format!("call &{reg}") } I::CallRelU32RegU32Offset(offset, reg) => { - format!("callr 0x{offset:08x}, &{reg}") + format!("call.r 0x{offset:08x}, &{reg}") } I::CallRelCSU32Offset(offset, label) => { if label.is_empty() { - format!("callr 0x{offset:08x}") + format!("call.r 0x{offset:08x}") } else { - format!("callr {label}") + format!("call.r {label}") } } - I::RetArgsU32 => String::from("iret"), + I::RetArgsU32 => String::from("ret.i"), I::Int(int_code) => { format!("int 0x{int_code:02x}") } diff --git a/redox-core/src/parsing/type_hints.rs b/redox-core/src/parsing/type_hints.rs index c02fe27..b11079a 100644 --- a/redox-core/src/parsing/type_hints.rs +++ b/redox-core/src/parsing/type_hints.rs @@ -146,12 +146,12 @@ impl<'a> InstructionHints<'a> { gen_hint!(vec!["call"], [U32Pointer], O::CallAbsU32Imm), gen_hint!(vec!["call"], [RegisterU32Pointer], O::CallAbsU32Reg), gen_hint!( - vec!["callr"], + vec!["call.r"], [U32, RegisterU32Pointer], O::CallRelU32RegU32Offset ), - gen_hint!(vec!["callr"], [U32], O::CallRelCSU32Offset), - gen_hint!(vec!["iret"], [], O::RetArgsU32), + gen_hint!(vec!["call.r"], [U32], O::CallRelCSU32Offset), + gen_hint!(vec!["ret.i"], [], O::RetArgsU32), gen_hint!(vec!["int"], [U8], O::Int), gen_hint!(vec!["intret"], [], O::IntRet), gen_hint!(vec!["jmp"], [U32Pointer], O::JumpAbsU32Imm), diff --git a/redox-terminal/src/main.rs b/redox-terminal/src/main.rs index ee34354..892bac8 100644 --- a/redox-terminal/src/main.rs +++ b/redox-terminal/src/main.rs @@ -74,7 +74,7 @@ fn main() { hlt :LABEL_1 mov 0xdeadbeef, EAX - iret"; + ret.i"; let mut compiler = Compiler::new(); let data = compiler.compile_assembly(code, true); From 5f3b91f18b0b742996550a3e73e06ee1f4503d23 Mon Sep 17 00:00:00 2001 From: Ryan Jones-Ward Date: Thu, 18 Jul 2024 12:24:41 +0100 Subject: [PATCH 05/10] Shift some code into its own function, for future expansion and clarity. --- redox-core/src/compiling/compiler.rs | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/redox-core/src/compiling/compiler.rs b/redox-core/src/compiling/compiler.rs index a03eb10..0c0d93a 100644 --- a/redox-core/src/compiling/compiler.rs +++ b/redox-core/src/compiling/compiler.rs @@ -168,15 +168,14 @@ impl Compiler { panic!("syntax error - no label with the name of {label} has been defined."); }; + let position = label_entry.position as u32; + match label_entry.label_type { LabelType::Code => { - *ins = match ins { - Instruction::CallAbsU32Imm(_, label) => Instruction::CallRelCSU32Offset( - label_entry.position as u32, - label.clone(), - ), - Instruction::CallRelCSU32Offset(_, _) => continue, - _ => unreachable!("unexpected labelled instruction instance - {ins}"), + if let Some(i) = + Compiler::maybe_rewrite_code_labelled_instruction(ins, position) + { + *ins = i; } } LabelType::Data => todo!(), @@ -185,6 +184,21 @@ impl Compiler { } } + #[inline] + fn maybe_rewrite_code_labelled_instruction( + ins: &Instruction, + label_position: u32, + ) -> Option { + match ins { + Instruction::CallAbsU32Imm(_, label) => Some(Instruction::CallRelCSU32Offset( + label_position, + label.clone(), + )), + Instruction::CallRelCSU32Offset(_, _) => None, + _ => unreachable!("unexpected labelled instruction - {ins}"), + } + } + /// Compile a single instruction into bytecode. /// /// # Arguments From 736a8570267c648ddd379bf13f5bf4366424a452 Mon Sep 17 00:00:00 2001 From: Ryan Jones-Ward Date: Wed, 13 Nov 2024 13:27:05 +0000 Subject: [PATCH 06/10] Dependency updates. --- Cargo.toml | 8 ++++---- redox-core/src/compiling/compiler.rs | 13 ++++--------- redox-core/src/cpu.rs | 8 ++++---- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 69da7d2..729d785 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,8 +7,8 @@ default-members = ["redox-terminal", "redox-core"] [workspace.dependencies] criterion = "0.5.1" enumflags2 = "0.7.10" -float-cmp = "0.9.0" -hashbrown = "0.14.5" +float-cmp = "0.10.0" +hashbrown = "0.15.1" itertools = "0.13.0" num-traits = "0.2.19" num-derive = "0.4.2" @@ -17,9 +17,9 @@ rand = "0.8.5" rand_xoshiro = "0.6.0" strum = "0.26.3" strum_macros = "0.26.4" -thiserror = "1.0.61" +thiserror = "2.0.3" unescape = "0.1.0" -unicode-segmentation = "1.11.0" +unicode-segmentation = "1.12.0" winres = "0.1.12" [profile.dev] diff --git a/redox-core/src/compiling/compiler.rs b/redox-core/src/compiling/compiler.rs index 0c0d93a..a86a953 100644 --- a/redox-core/src/compiling/compiler.rs +++ b/redox-core/src/compiling/compiler.rs @@ -74,21 +74,16 @@ impl Compiler { // Now load the code labels. self.load_code_labels(&instructions); - println!("labels = {:?}", self.labels); + //println!("labels = {:#?}", self.labels); if optimize { // TODO - optimizations should go here. // TODO - an optimization here might be to use a short call/jump instruction // TODO - if the call address is close enough, for example. - // TODO - the calculate label positions method should be called here again. - // TODO - this is because the instructions may have changed, altering the relative positions of the labels. - } - - // TODO - do we care enough to do this? - if optimize { - // TODO - a second optimization pass should go here to optimize any labels - // TODO - related to the data section. + // TODO - the calculate code label positions method should be called here again. + // TODO - this is because the instructions may have changed, altering the relative + // TODO - positions of the code labels. } self.handle_labelled_instructions(&mut instructions); diff --git a/redox-core/src/cpu.rs b/redox-core/src/cpu.rs index a3c0fd9..1adca59 100644 --- a/redox-core/src/cpu.rs +++ b/redox-core/src/cpu.rs @@ -1753,9 +1753,9 @@ mod tests_cpu { // Did the test registers match their expected values? self.expected_changed_registers .iter() - .for_each(|(id, expected_value)| { + .for_each(|(id, &expected_value)| { let actual_value = vm.cpu.registers.read_reg_f32_unchecked(id); - if *expected_value != actual_value { + if expected_value != actual_value { table.add_row(row![ id, format!("{expected_value}"), @@ -1899,9 +1899,9 @@ mod tests_cpu { // Did the test registers match their expected values? self.expected_changed_registers .iter() - .for_each(|(id, expected_value)| { + .for_each(|(id, &expected_value)| { let actual_value = vm.cpu.registers.read_reg_u32_unchecked(id); - if *expected_value != actual_value { + if expected_value != actual_value { table.add_row(row![ id, format!("{expected_value}"), From 2c762380d5d1705befd01a7aae9636b5e267015a Mon Sep 17 00:00:00 2001 From: Ryan Jones-Ward Date: Mon, 20 Jan 2025 12:26:45 +0000 Subject: [PATCH 07/10] Dependency updates. --- Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 729d785..b14b945 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,8 +8,8 @@ default-members = ["redox-terminal", "redox-core"] criterion = "0.5.1" enumflags2 = "0.7.10" float-cmp = "0.10.0" -hashbrown = "0.15.1" -itertools = "0.13.0" +hashbrown = "0.15.2" +itertools = "0.14.0" num-traits = "0.2.19" num-derive = "0.4.2" prettytable = "0.10.0" @@ -17,7 +17,7 @@ rand = "0.8.5" rand_xoshiro = "0.6.0" strum = "0.26.3" strum_macros = "0.26.4" -thiserror = "2.0.3" +thiserror = "2.0.11" unescape = "0.1.0" unicode-segmentation = "1.12.0" winres = "0.1.12" From 6240cc5cf3c6ad5fd9c5f7c3444e2751786696e0 Mon Sep 17 00:00:00 2001 From: Ryan Jones-Ward Date: Wed, 22 Jan 2025 15:26:54 +0000 Subject: [PATCH 08/10] Minor syntax updates. --- redox-core/src/compiling/compiler.rs | 4 +--- redox-core/src/parsing/asm_parser.rs | 34 ++++++++++++++-------------- redox-core/src/parsing/type_hints.rs | 4 ++-- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/redox-core/src/compiling/compiler.rs b/redox-core/src/compiling/compiler.rs index a86a953..f5e1685 100644 --- a/redox-core/src/compiling/compiler.rs +++ b/redox-core/src/compiling/compiler.rs @@ -157,9 +157,7 @@ impl Compiler { // Attempt to get the label entry. // If a label has been used but has not been defined then that is a syntax error. - let label_entry = if let Some(l) = self.labels.get(label) { - l - } else { + let Some(label_entry) = self.labels.get(label) else { panic!("syntax error - no label with the name of {label} has been defined."); }; diff --git a/redox-core/src/parsing/asm_parser.rs b/redox-core/src/parsing/asm_parser.rs index 019324e..3024ef1 100644 --- a/redox-core/src/parsing/asm_parser.rs +++ b/redox-core/src/parsing/asm_parser.rs @@ -82,33 +82,33 @@ impl FromStr for FileSection { /// Cheekily get the inner value of an enum. macro_rules! get_inner_arg { ($target:expr, $enum:path) => {{ - if let $enum(a) = $target { - a - } else { + let $enum(a) = $target else { unreachable!(); - } + }; + + a }}; } /// Cheekily get the inner value of an enum, with casting. macro_rules! get_inner_arg_and_cast { ($target:expr, $enum:path, $cast:ident) => {{ - if let $enum(a) = $target { - a as $cast - } else { + let $enum(a) = $target else { unreachable!(); - } + }; + + a as $cast }}; } /// Cheekily get and pack an inner enum expression. macro_rules! get_inner_expr_arg { ($target:expr) => {{ - if let Argument::Expression(expr) = &$target { - expr.pack() - } else { + let Argument::Expression(expr) = &$target else { unreachable!() - } + }; + + expr.pack() }}; } @@ -485,11 +485,11 @@ impl<'a> AsmParser<'a> { fn parse_section_line(line: &str) -> FileSection { assert!(line.len() >= 9); - if let Ok(section) = FileSection::from_str(&line[9..]) { - section - } else { + let Ok(section) = FileSection::from_str(&line[9..]) else { panic!("invalid assembly file section name - {}", &line[9..]) - } + }; + + section } /// Push a string buffer onto an string argument vector. @@ -1126,7 +1126,7 @@ impl<'a> AsmParser<'a> { } } -impl<'a> Default for AsmParser<'a> { +impl Default for AsmParser<'_> { fn default() -> Self { Self::new() } diff --git a/redox-core/src/parsing/type_hints.rs b/redox-core/src/parsing/type_hints.rs index b11079a..19131bc 100644 --- a/redox-core/src/parsing/type_hints.rs +++ b/redox-core/src/parsing/type_hints.rs @@ -93,7 +93,7 @@ pub struct InstructionHints<'a> { pub hints: Vec>, } -impl<'a> InstructionHints<'a> { +impl InstructionHints<'_> { pub fn new() -> Self { use ArgTypeHint::*; use OpCode as O; @@ -276,7 +276,7 @@ impl<'a> InstructionHints<'a> { } } -impl<'a> Default for InstructionHints<'a> { +impl Default for InstructionHints<'_> { fn default() -> Self { Self::new() } From 6b340df7ce695e5c2314cbf4431c885cd19bdf4d Mon Sep 17 00:00:00 2001 From: Ryan Jones-Ward Date: Tue, 28 Jan 2025 19:55:57 +0000 Subject: [PATCH 09/10] Dependency updates and associated fixes. --- Cargo.toml | 5 +-- redox-core/Cargo.toml | 1 + redox-core/src/com_bus/random_device.rs | 42 ++++++++++++++++++------- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b14b945..e9cd091 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,8 +13,9 @@ itertools = "0.14.0" num-traits = "0.2.19" num-derive = "0.4.2" prettytable = "0.10.0" -rand = "0.8.5" -rand_xoshiro = "0.6.0" +rand = "0.9.0" +rand_core = "0.9.0" +rand_xoshiro = "0.7.0" strum = "0.26.3" strum_macros = "0.26.4" thiserror = "2.0.11" diff --git a/redox-core/Cargo.toml b/redox-core/Cargo.toml index e267938..de2995c 100644 --- a/redox-core/Cargo.toml +++ b/redox-core/Cargo.toml @@ -20,6 +20,7 @@ num-traits.workspace = true num-derive.workspace = true prettytable.workspace = true rand.workspace = true +rand_core.workspace = true rand_xoshiro.workspace = true strum.workspace = true strum_macros.workspace = true diff --git a/redox-core/src/com_bus/random_device.rs b/redox-core/src/com_bus/random_device.rs index 247d99a..4c80d1e 100644 --- a/redox-core/src/com_bus/random_device.rs +++ b/redox-core/src/com_bus/random_device.rs @@ -1,4 +1,4 @@ -use rand::{rngs::OsRng, Rng, SeedableRng}; +use rand::{rngs::OsRng, Rng, SeedableRng, TryRngCore}; use rand_xoshiro::Xoshiro256Plus; use std::cell::RefCell; @@ -8,7 +8,7 @@ use super::{ }; thread_local! { - static PRNG: RefCell = RefCell::new(Xoshiro256Plus::from_entropy()); + static PRNG: RefCell = RefCell::new(Xoshiro256Plus::from_os_rng()); static CRNG: RefCell = const { RefCell::new(OsRng) }; } @@ -50,9 +50,15 @@ impl ComBusIO for RandomDevice { } Ok(match self.mode { - RandomMode::Crypto => CRNG.with(|r| r.borrow_mut().gen::()), - RandomMode::Seeded => PRNG.with(|r| r.borrow_mut().gen::()), - RandomMode::Standard => rand::thread_rng().gen::(), + RandomMode::Crypto => CRNG.with(|r| { + let mut arr: [u8; 1] = [0; 1]; + r.borrow_mut() + .try_fill_bytes(&mut arr) + .expect("failed to get bytes"); + arr[0] + }), + RandomMode::Seeded => PRNG.with(|r| r.borrow_mut().random::()), + RandomMode::Standard => rand::rng().random::(), }) } @@ -62,9 +68,15 @@ impl ComBusIO for RandomDevice { } Ok(match self.mode { - RandomMode::Crypto => CRNG.with(|r| r.borrow_mut().gen::()), - RandomMode::Seeded => PRNG.with(|r| r.borrow_mut().gen::()), - RandomMode::Standard => rand::thread_rng().gen::(), + RandomMode::Crypto => CRNG.with(|r| { + let mut arr: [u8; 4] = [0; 4]; + r.borrow_mut() + .try_fill_bytes(&mut arr) + .expect("failed to get bytes"); + u32::from_ne_bytes(arr) + }), + RandomMode::Seeded => PRNG.with(|r| r.borrow_mut().random::()), + RandomMode::Standard => rand::rng().random::(), }) } @@ -74,9 +86,15 @@ impl ComBusIO for RandomDevice { } Ok(match self.mode { - RandomMode::Crypto => CRNG.with(|r| r.borrow_mut().gen::()), - RandomMode::Seeded => PRNG.with(|r| r.borrow_mut().gen::()), - RandomMode::Standard => rand::thread_rng().gen::(), + RandomMode::Crypto => CRNG.with(|r| { + let mut arr: [u8; 4] = [0; 4]; + r.borrow_mut() + .try_fill_bytes(&mut arr) + .expect("failed to get bytes"); + f32::from_ne_bytes(arr) + }), + RandomMode::Seeded => PRNG.with(|r| r.borrow_mut().random::()), + RandomMode::Standard => rand::rng().random::(), }) } @@ -87,7 +105,7 @@ impl ComBusIO for RandomDevice { match value { 0 => { // Standard mode - a PRNG derived from entropy. - PRNG.with(|r| *r.borrow_mut() = Xoshiro256Plus::from_entropy()); + PRNG.with(|r| *r.borrow_mut() = Xoshiro256Plus::from_os_rng()); self.mode = RandomMode::Standard; self.is_initialized = true; } From a3e94c23d646091cef64437a828d24d639d0a676 Mon Sep 17 00:00:00 2001 From: Ryan Jones-Ward Date: Sun, 2 Feb 2025 15:39:56 +0000 Subject: [PATCH 10/10] Rework how the random number generating device operates internally, it is now more sane and less complicated overall. --- redox-core/src/com_bus/com_bus_io.rs | 6 +- redox-core/src/com_bus/random_device.rs | 104 +++++++++----------- redox-core/src/com_bus/test_debug_device.rs | 6 +- 3 files changed, 53 insertions(+), 63 deletions(-) diff --git a/redox-core/src/com_bus/com_bus_io.rs b/redox-core/src/com_bus/com_bus_io.rs index 9c35ccb..d772b8f 100644 --- a/redox-core/src/com_bus/com_bus_io.rs +++ b/redox-core/src/com_bus/com_bus_io.rs @@ -2,11 +2,11 @@ use super::device_error::DeviceResult; pub trait ComBusIO { /// Read a u8 value from the device. - fn read_u8(&self) -> DeviceResult; + fn read_u8(&mut self) -> DeviceResult; /// Read a u32 value from the device. - fn read_u32(&self) -> DeviceResult; + fn read_u32(&mut self) -> DeviceResult; /// Read a uf32 value from the device. - fn read_f32(&self) -> DeviceResult; + fn read_f32(&mut self) -> DeviceResult; /// Write a u8 value to the device. fn write_u8(&mut self, value: u8) -> DeviceResult<()>; diff --git a/redox-core/src/com_bus/random_device.rs b/redox-core/src/com_bus/random_device.rs index 4c80d1e..d36185c 100644 --- a/redox-core/src/com_bus/random_device.rs +++ b/redox-core/src/com_bus/random_device.rs @@ -1,30 +1,28 @@ use rand::{rngs::OsRng, Rng, SeedableRng, TryRngCore}; use rand_xoshiro::Xoshiro256Plus; -use std::cell::RefCell; use super::{ com_bus_io::ComBusIO, device_error::{DeviceError, DeviceResult}, }; -thread_local! { - static PRNG: RefCell = RefCell::new(Xoshiro256Plus::from_os_rng()); - static CRNG: RefCell = const { RefCell::new(OsRng) }; -} - +#[repr(u8)] #[derive(PartialEq, Eq)] enum RandomMode { Crypto, - Seeded, - Standard, + Pseudorandom, } -/// The seedable random generator chip! +/// The random number generator device! pub struct RandomDevice { /// Has the random number generator been initialized? is_initialized: bool, /// The random generator mode currently being used. mode: RandomMode, + /// The pseudorandom number generator. + prng: Xoshiro256Plus, + /// The Cryptographically secure RNG generator. + crng: OsRng, } impl RandomDevice { @@ -32,7 +30,9 @@ impl RandomDevice { Self { // By default we initialize the random number generator using entropy. is_initialized: true, - mode: RandomMode::Standard, + mode: RandomMode::Crypto, + prng: Xoshiro256Plus::from_os_rng(), + crng: OsRng, } } } @@ -44,57 +44,51 @@ impl Default for RandomDevice { } impl ComBusIO for RandomDevice { - fn read_u8(&self) -> DeviceResult { + fn read_u8(&mut self) -> DeviceResult { if !self.is_initialized { return DeviceResult::Err(DeviceError::Misconfigured); } Ok(match self.mode { - RandomMode::Crypto => CRNG.with(|r| { + RandomMode::Crypto => { let mut arr: [u8; 1] = [0; 1]; - r.borrow_mut() + self.crng .try_fill_bytes(&mut arr) - .expect("failed to get bytes"); + .expect("failed to get u8"); arr[0] - }), - RandomMode::Seeded => PRNG.with(|r| r.borrow_mut().random::()), - RandomMode::Standard => rand::rng().random::(), + } + RandomMode::Pseudorandom => self.prng.random::(), }) } - fn read_u32(&self) -> DeviceResult { + fn read_u32(&mut self) -> DeviceResult { if !self.is_initialized { return DeviceResult::Err(DeviceError::Misconfigured); } Ok(match self.mode { - RandomMode::Crypto => CRNG.with(|r| { - let mut arr: [u8; 4] = [0; 4]; - r.borrow_mut() - .try_fill_bytes(&mut arr) - .expect("failed to get bytes"); - u32::from_ne_bytes(arr) - }), - RandomMode::Seeded => PRNG.with(|r| r.borrow_mut().random::()), - RandomMode::Standard => rand::rng().random::(), + RandomMode::Crypto => self.crng.try_next_u32().expect("failed to get u32"), + RandomMode::Pseudorandom => self.prng.random::(), }) } - fn read_f32(&self) -> DeviceResult { + fn read_f32(&mut self) -> DeviceResult { if !self.is_initialized { return DeviceResult::Err(DeviceError::Misconfigured); } Ok(match self.mode { - RandomMode::Crypto => CRNG.with(|r| { - let mut arr: [u8; 4] = [0; 4]; - r.borrow_mut() - .try_fill_bytes(&mut arr) - .expect("failed to get bytes"); - f32::from_ne_bytes(arr) - }), - RandomMode::Seeded => PRNG.with(|r| r.borrow_mut().random::()), - RandomMode::Standard => rand::rng().random::(), + RandomMode::Crypto => { + // We want to weed out any potential infinities or NaN's, + // and we'll iterate until we find one. + let mut value = f32::INFINITY; + while !value.is_finite() { + let v = self.crng.try_next_u32().expect("failed to get u32"); + value = f32::from_bits(v); + } + value + } + RandomMode::Pseudorandom => self.prng.random::(), }) } @@ -104,19 +98,15 @@ impl ComBusIO for RandomDevice { // The instruction indicating the type of random number generator to be used. match value { 0 => { - // Standard mode - a PRNG derived from entropy. - PRNG.with(|r| *r.borrow_mut() = Xoshiro256Plus::from_os_rng()); - self.mode = RandomMode::Standard; + // Cryptographic random mode - a cryptographically secure random number generator. + // This is the default. + self.mode = RandomMode::Crypto; self.is_initialized = true; } 1 => { - // Seeded random mode - the seed must be set via sending a u32 command after this one. - self.mode = RandomMode::Seeded; - self.is_initialized = false; - } - 2 => { - // Cryptographic random mode - a cryptographically secure random number generator. - self.mode = RandomMode::Crypto; + // Standard mode - a PRNG derived from entropy. + self.prng = Xoshiro256Plus::from_os_rng(); + self.mode = RandomMode::Pseudorandom; self.is_initialized = true; } _ => { @@ -130,8 +120,8 @@ impl ComBusIO for RandomDevice { fn write_u32(&mut self, value: u32) -> DeviceResult<()> { let mut result = DeviceResult::Ok(()); - if self.mode == RandomMode::Seeded { - PRNG.with(|r| *r.borrow_mut() = Xoshiro256Plus::seed_from_u64(value as u64)); + if self.mode == RandomMode::Pseudorandom { + self.prng = Xoshiro256Plus::seed_from_u64(value as u64); // Indicate that the PRNG has been seeded and initialized. self.is_initialized = true; @@ -149,21 +139,21 @@ impl ComBusIO for RandomDevice { #[cfg(test)] mod tests_random_device { - use crate::com_bus::com_bus_io::ComBusIO; + use crate::com_bus::{com_bus_io::ComBusIO, random_device::RandomMode}; use super::RandomDevice; - /// Test the PRNG to ensure it is non-repeating. + /// Test the cryptographic RNG to ensure it is non-repeating. #[test] - fn test_prng() { - // By default, the generator should use an entropy-seeded PRNG. - let device = RandomDevice::default(); + fn test_crng() { + // By default, the generator should use an entropy-seeded RNG. + let mut device = RandomDevice::default(); let mut sequence_1 = vec![]; for _ in 0..1000 { sequence_1.push(device.read_u32().expect("")); } - let device = RandomDevice::default(); + let mut device = RandomDevice::default(); let mut sequence_2 = vec![]; for _ in 0..1000 { sequence_2.push(device.read_u32().expect("")); @@ -176,7 +166,7 @@ mod tests_random_device { #[test] fn test_seeded_prng() { let mut device = RandomDevice::default(); - _ = device.write_u8(0x1); + _ = device.write_u8(RandomMode::Pseudorandom as u8); _ = device.write_u32(0xdeadbeef); let mut sequence_1 = vec![]; @@ -185,7 +175,7 @@ mod tests_random_device { } let mut device = RandomDevice::default(); - _ = device.write_u8(0x1); + _ = device.write_u8(RandomMode::Pseudorandom as u8); _ = device.write_u32(0xdeadbeef); let mut sequence_2 = vec![]; diff --git a/redox-core/src/com_bus/test_debug_device.rs b/redox-core/src/com_bus/test_debug_device.rs index eff5da9..4784a64 100644 --- a/redox-core/src/com_bus/test_debug_device.rs +++ b/redox-core/src/com_bus/test_debug_device.rs @@ -27,7 +27,7 @@ impl Default for TestDebugDevice { } impl ComBusIO for TestDebugDevice { - fn read_u8(&self) -> DeviceResult { + fn read_u8(&mut self) -> DeviceResult { if self.should_fail[0] { return DeviceResult::Err(DeviceError::OperationNotSupported); } @@ -35,7 +35,7 @@ impl ComBusIO for TestDebugDevice { Ok(u8::MAX) } - fn read_u32(&self) -> DeviceResult { + fn read_u32(&mut self) -> DeviceResult { if self.should_fail[1] { return DeviceResult::Err(DeviceError::OperationNotSupported); } @@ -43,7 +43,7 @@ impl ComBusIO for TestDebugDevice { Ok(u32::MAX) } - fn read_f32(&self) -> DeviceResult { + fn read_f32(&mut self) -> DeviceResult { if self.should_fail[2] { return DeviceResult::Err(DeviceError::OperationNotSupported); }