diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3aaebda --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +cos-lite-old.tal +collapseos.bin +*.rom +blkfs +blk0* diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..cf7069c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "collapseos"] + path = collapseos + url = https://github.com/schierlm/collapseos diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md new file mode 100644 index 0000000..40aeefa --- /dev/null +++ b/README.md @@ -0,0 +1,60 @@ +# collapseos-uxn + +Port of CollapseOS to uxn Tal + +## Description + +This is a port of [Collapse OS](http://collapseos.org/) (Snapshot 2022-05-09) to the +[uxn](https://100r.co/site/uxn.html)/[varvara](https://wiki.xxiivv.com/site/varvara.html) +virtual machine. + +Unlike other Collapse OS ports, it does not try to assemble the whole rom image +using Collapse OS Forth. Instead it uses a two-step approach. + +The core image of the OS is assambled using [uxntal](https://wiki.xxiivv.com/site/uxntal.html), +and will dynamically load a forth image from `collapseos.bin` at `$0800`, overwriting the +initialization code that resided at that place previously. As uxntal is self-hosting on UXN, +this shortcut was deemed acceptable to me. The tooling for uxntal in VS Code as well as UXN32 +debugger support made porting definitely faster for me that way. Also, the ISA/ABI is unstable +enough to require three different uxnasm builds to compile for three different emulators, so +building an assembler written in Forth is just not an option for me. + +Also note that the port was started at the CVM port and only implements the bare minimum +of native words - first make it work, then make it faster. + +I was considering to use the native operand and return stack for the Forth operand and return +stack, but ultimately decided against it. The event-driven nature of keyboard input would +have required the `(key)` word to unwind the stack and store it elsewhere, and later restore +once a key is pressed or the timer interrupt vector fires. + +Therefore, like most other ports, the Forth operand and return stack live in normal system memory; +the stack pointers live in the zero page among other global variables. + +There are two versions. The normal version supports a block filesystem which may either exist as +a single file named `blkfs`, or multiple files named `blk0000` to `blk9999`. At first startup +the former file is converted to the latter form and then deleted. This design choice was driven +by the fact that when *writing* files on varvara, there is no way to seek. Therefore writing each +block into a separate file gets away with that limitation easily. + +The second, *lite* version does not support block filesystems, and does not require filesystem +access. To use, you have to concatenate the forth image file to the core image file (which is `$0700` +bytes long, making the forth image end up at `$0800`). + +It has been tested in the latest version of the UXN32 emulator (2022-04-26). +There is also a version of the lite image available, which is built with an older +version of uxnasm ([commit 8d14b4bbc6f1e50f313293ba301268fbc7d9090e](https://git.sr.ht/~rabbits/uxn/commit/8d14b4bbc6f1e50f313293ba301268fbc7d9090e), +to be precise), which should work in the [WebUxn](https://aduros.com/webuxn/) emulator. + +## Download + +Have a look in the file release section if you want to download binaries to try. + +## License + +GPL3, just like Collapse OS + +## Moving forward + +Feel free to adopt this project if you find it interesting. I will follow Virgil's route and not update this project regularly. +(The fact that there are different incompatible versions of uxn images, without even a version number for them, and some emulators +get updated and some do not, has deterred me from keeping this up to date.) diff --git a/collapseos b/collapseos new file mode 160000 index 0000000..1752bf6 --- /dev/null +++ b/collapseos @@ -0,0 +1 @@ +Subproject commit 1752bf657a8aa4a641897ab783607501b88389ab diff --git a/collapseos.tal b/collapseos.tal new file mode 100644 index 0000000..f89d4b6 --- /dev/null +++ b/collapseos.tal @@ -0,0 +1,112 @@ +~common.tal + +@blkinit ( initialize blkfs ) + #00 .File/append DEO + #0400 .File/addr(length) DEO2 + RTN + +@blkfile "blk &startpos "000 &endpos "0 00 + +@setblkname ( stack: blkno ) + ;blkfile/endpos SWP2 ( stack: charpos number ) + &nameloop + #000a DIV2k SWP2 OVR2 MUL2 ROT2 SWP2 SUB2 #0030 ADD2 ROT2 + ( stack: number/10 number%10+'0' charpos ) + STAk SWP2 POP2 + DUP2 ;blkfile/startpos NEQ2 #77 ROT2 ROT2 #0001 SUB2 SWP2 ROT2 POP + ( stack: charpos-1 number/10 cond ) + ,&nameloop JCN POP2 POP2 ( stack empty ) + RTN + +@op-uxnStorage + ;ppop JSR2 ;ppop JSR2 ;ppop JSR2 .ZP/tmp1 STZ2 ( tmp1 = block number ) .ZP/tmp2 STZ2 ( tmp2 = memory address ) + SWP POP DUP #01 EQU ,&read JCN + #02 EQU ,&write JCN + ;handler/stop JMP2 + &read POP + .ZP/tmp1 LDZ2 ;setblkname JSR2 + ;blkfile .File/addr(name) DEO2 + .ZP/tmp2 LDZ2 .File/addr(read) DEO2 + ;handler/next JMP2 + &write + .ZP/tmp1 LDZ2 ;setblkname JSR2 + ;blkfile .File/addr(name) DEO2 + .ZP/tmp2 LDZ2 .File/addr(write) DEO2 + ;handler/next JMP2 + +|0800 @ROMSTART + +( ### initialization code - will be overwritten by ROM file ### ) + +( variables used by initialization program ) +@infile "blkfs 00 +@romfile "collapseos.bin 00 + +@init + #0000 .ZP/tmp1 STZ2 ( tmp1 = offset ) + ©file ( copy blkfs to individual files ) + ( read block ) + ;infile .File/addr(name) DEO2 + #0400 .File/addr(length) DEO2 + .ZP/tmp1 LDZ2 ( stack: offs ) + &readloop + ;COPYBUF .File/addr(read) DEO2 + DUP2 #0001 SUB2 SWP2 ( stack: offs-1 offs ) + #0000 NEQ2 ,&readloop JCN POP2 ( stack empty ) + .File/success DEI2 #0000 EQU2 ,&done JCN ( quit if EOF reached ) + ( now we need to update the file name ) + .ZP/tmp1 LDZ2 ;setblkname JSR2 + ( write block ) + ;blkfile .File/addr(name) DEO2 + #00 .File/append DEO + #0400 .File/addr(length) DEO2 + ;COPYBUF .File/addr(write) DEO2 + .ZP/tmp1 LDZ2 INC2 .ZP/tmp1 STZ2 + ;©file JMP2 + &done + ;infile .File/addr(name) DEO2 + #01 .File/delete DEO + ( initialize zero page ) + PS_ADDR .ZP/psp STZ2 + RS_ADDR .ZP/rsp STZ2 + #ffff .ZP/ir STZ2 + ;ROMSTART .ZP/pc STZ2 + #00 .KBuf/read STZ + #00 .KBuf/write STZ + #00 .KBuf/altgr-flag STZ + #00 .ZP/curX STZ + #00 .ZP/curY STZ + ( initialize theme ) + #0f0f .System/r DEO2 + #0f0f .System/g DEO2 + #0ff0 .System/b DEO2 + ( initialize and clear screen ) + #0290 .Screen/width DEO2 + #00d8 .Screen/height DEO2 + .EmptySprite #00 + &clearloop ADDk #00 SWP STZ INC DUP #08 LTH ,&clearloop JCN + ADD #fe SWP STZ + ;EmptySprite .Screen/addr DEO2 + #00 #00 ( stack: y x ) + &lineloop + OVR INC #00 SWP #0008 MUL2 .Screen/y DEO2 + &cellloop + DUP INC #00 SWP #0008 MUL2 .Screen/x DEO2 + #49 .Screen/sprite DEO + INC DUP #50 LTH ,&cellloop JCN + POP INC #00 OVR #19 LTH ,&lineloop JCN + POP2 + ( prepare to read ROM ) + ;romfile .File/addr(name) DEO2 + #2000 .File/addr(length) DEO2 + ;ROMSTART .File/addr(read) + + ( go to main program ) + ;main JMP2 + +( copy buffer ) +|0a00 @COPYBUF $1 + +( file device ) +|a0 @File [ &vector $2 &success $2 &addr(stat) $2 &delete $1 &append $1 + &addr(name) $2 &addr(length) $2 &addr(read) $2 &addr(write) $2 ] diff --git a/common.tal b/common.tal new file mode 100644 index 0000000..31e781a --- /dev/null +++ b/common.tal @@ -0,0 +1,350 @@ +( constants ) +%SYSVARS+#18 { #fe18 } +%RS_ADDR { #ff00 } +%PS_ADDR { #fffa } + +( macros ) +%MOD { DIVk MUL SUB } +%MOD2 { DIV2k MUL2 SUB2 } +%RTN { JMP2r } +%HALF2 { DUP2 #8000 AND2 #01 SFT2 ORA2 } ( signed division by 2 ) + +( zero page ) +|00 @ZP [ &psp $2 &rsp $2 &ir $2 &pc $2 &curX $1 &curY $1 &tmpX $1 &tmpY $1 &tmp1 $2 &tmp2 $2 ] + +( keyboard buffer ) +@KBuf [ &read $1 &write $1 &altgr-flag $1 &buf $10 ] + +( cursor sprite ) +|f0 @EmptySprite $1 @CursorSprite $8 + +( devices ) +|00 @System [ &vector $2 &wst $1 &rst $1 &pad $4 &r $2 &g $2 &b $2 &debug $1 &halt $1 ] +|10 @Console [ &vector $2 &read $1 &pad $5 &write $1 &error $1 ] +|20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &pixel $1 &sprite $1 ] +|80 @Controller [ &vector $2 &button $1 &key $1 ] + +( stable ABI ) +|0100 ;init JMP2 + +( main program ) +@main + ( probably read ROM ) + DEO2 + ( initialize file interface for blkfs ) + ;blkinit JSR2 + ( setup screen vector and keyboard vector ) + ;handler .Screen/vector DEO2 + ;key-handler .Controller/vector DEO2 + BRK + +( utility functions ) +@ppeek ( read PSP and place on stack ) + .ZP/psp LDZ2 LDA2 + RTN + +@ppop ( read PSP and place on stack, then increment PSP ) + ,ppeek JSR .ZP/psp LDZ2 INC2 INC2 .ZP/psp STZ2 + RTN + +@ppush ( decrement psp then store value from stack there ) + .ZP/psp LDZ2 #0002 SUB2 DUP2 .ZP/psp STZ2 STA2 + RTN + +@rpop ( read RSP and place on stack, then decrement RSP ) + .ZP/rsp LDZ2 DUP2 LDA2 SWP2 #0002 SUB2 .ZP/rsp STZ2 + RTN + +@rpush ( increment RSP then store value from stack there ) + .ZP/rsp LDZ2 INC2 INC2 DUP2 .ZP/rsp STZ2 STA2 + RTN + +@pc16 ( read WORD at PC to stack and increment PC ) + .ZP/pc LDZ2 DUP2 LDA2 SWP2 INC2 INC2 .ZP/pc STZ2 + RTN + +@jumptable ( jump table for commands ) + ( 00 ) :op-DUP :op-DROP :op-i>, :op-(i)>, :op-SWAP :op-OVER :op-ROT :op-lblnext + ( 08 ) :op-(?br) :op-(next) :op-CALLi, :op-JMPi, :op-lblxt :op-EXIT :op-?DUP :op-(b) + ( 10 ) :op-(n) :op-JMP(i), :op-lbldoes :op-lblval :op-uxnCell :op-EXECUTE :op-(key) :op-uxnStorage + ( 18 ) :op-uxnDEI :op-uxnDEO :op-R~ :op-uxnDEI2 :op-+ :op-- :op-(br) :op-uxnDEO2 + ( 20 ) :op-* :op-< :op-/MOD :op-QUIT :op-ABORT :op-RCNT :op-NOT :op-AND + ( 28 ) :op-OR :op-XOR :op-SCNT :op-BYE :op-R@ :op-R> :op->R :op-C@ + ( 30 ) :op-@ :op-! :op-C! + +@key-handler ( keyboard handler ) + .Controller/key DEI + DUP #00 EQU ,&done JCN ( check for char ) + .Controller/button DEI + ( most of the code here is for handling AltGr keys, which create both Ctrl+Alt+X and Ctrl+Alt+special character ) + DUP #fb AND #03 EQU ,&altgr-char JCN + #fb AND #00 EQU ,&normalkey JCN + ,&done JMP + &altgr-char POP ( key is on stack ) + .KBuf/altgr-flag LDZ #01 EQU ,&normalkey JCN + #01 .KBuf/altgr-flag STZ + ,&done JMP + &normalkey + ( normal key on stack - store to key buffer ) + #00 .KBuf/altgr-flag STZ + .KBuf/write LDZ #01 ADD #10 MOD .KBuf/read LDZ EQU ,&done JCN ( check for room ) + DUP .KBuf/write LDZ .KBuf/buf ADD STZ ( store char ) + .KBuf/write LDZ #01 ADD #10 MOD .KBuf/write STZ ( increase pointer ) + &done POP + BRK + +@handler ( run next command ) + .ZP/pc LDZ2 #ffff EQU2 ,&done JCN + &next + .ZP/pc LDZ2 DUP2 INC2 .ZP/pc STZ2 LDA ( stack: op ) + DUP #32 GTH ,&stop JCN + #00 SWP DUP2 ADD2 ;jumptable ADD2 LDA2 JMP2 + &stop + #ffff .ZP/pc STZ2 + &done + BRK + +@op-(br) ( branch IR to offset read at IR ) + #00 .ZP/ir LDZ2 LDA DUP #80 LTH ,&positive JCN #0100 SUB2 + &positive .ZP/ir LDZ2 ADD2 .ZP/ir STZ2 + ;handler/next JMP2 + +@op-(?br) + ;ppop JSR2 #0000 EQU2 ,op-(br) JCN + .ZP/ir LDZ2 INC2 .ZP/ir STZ2 + ;handler/next JMP2 + +@op-(next) + ;rpop JSR2 #0001 SUB2 DUP2 #0000 EQU2 ,&zero JCN + ;rpush JSR2 ,op-(br) JMP + &zero POP2 .ZP/ir LDZ2 INC2 .ZP/ir STZ2 + ;handler/next JMP2 + +@op-DUP + ;ppeek JSR2 ;ppush JSR2 + ;handler/next JMP2 + +@op-?DUP + ;ppeek JSR2 #0000 NEQ2 ,op-DUP JCN + ;handler/next JMP2 + +@op-DROP + ;ppop JSR2 POP2 + ;handler/next JMP2 + +@op-i>, + ;pc16 JSR2 ;ppush JSR2 + ;handler/next JMP2 + +@op-(i)>, + ;pc16 JSR2 LDA2 ;ppush JSR2 + ;handler/next JMP2 + +@op-SWAP + ;ppop JSR2 ;ppop JSR2 SWP2 ;ppush JSR2 ;ppush JSR2 + ;handler/next JMP2 + +@op-OVER + ;ppop JSR2 ;ppeek JSR2 SWP2 ;ppush JSR2 ;ppush JSR2 + ;handler/next JMP2 + +@op-ROT + ;ppop JSR2 ;ppop JSR2 ;ppop JSR2 ROT2 ROT2 ;ppush JSR2 ;ppush JSR2 ;ppush JSR2 + ;handler/next JMP2 + +@op-lblnext ( pc = gw(ir); ir += 2 ) + .ZP/ir LDZ2 DUP2 LDA2 .ZP/pc STZ2 INC2 INC2 .ZP/ir STZ2 + ;handler/next JMP2 + +@op-CALLi, + .ZP/pc LDZ2 INC2 INC2 ;ppush JSR2 + .ZP/pc LDZ2 LDA2 .ZP/pc STZ2 + ;handler/next JMP2 + +@op-JMPi, + .ZP/pc LDZ2 LDA2 .ZP/pc STZ2 + ;handler/next JMP2 + +@op-lblxt + .ZP/ir LDZ2 ;rpush JSR2 + ;ppop JSR2 DUP2 INC2 INC2 .ZP/ir STZ2 + LDA2 .ZP/pc STZ2 + ;handler/next JMP2 + +@op-EXIT + ;rpop JSR2 .ZP/ir STZ2 + ;handler/next JMP2 + +@op-(b) + .ZP/ir LDZ2 DUP2 LDA #00 SWP ;ppush JSR2 INC2 .ZP/ir STZ2 + ;handler/next JMP2 + +@op-(n) + .ZP/ir LDZ2 DUP2 LDA2 ;ppush JSR2 INC2 INC2 .ZP/ir STZ2 + ;handler/next JMP2 + +@op-JMP(i), + .ZP/pc LDZ2 LDA2 LDA2 .ZP/pc STZ2 + ;handler/next JMP2 + +@op-lbldoes + ;ppop JSR2 DUP2 INC2 INC2 ;ppush JSR2 + LDA2 .ZP/pc STZ2 + ;handler/next JMP2 + +@op-lblval + SYSVARS+#18 LDA #00 EQU ,&zero JCN + #00 SYSVARS+#18 STA + ;ppop JSR2 ;ppop JSR2 SWP2 STA2 + ,&done JMP + &zero + ;ppop JSR2 LDA2 ;ppush JSR2 + &done + .ZP/ir LDZ2 DUP2 LDA2 .ZP/pc STZ2 INC2 INC2 .ZP/ir STZ2 + ;handler/next JMP2 + +@op-uxnCell + ;ppop JSR2 .ZP/tmp1 STZ2 ( tmp1 = font address ) + ;ppop JSR2 SWP POP .ZP/tmpY STZ ( tmpY = y coordinate ) + ;ppop JSR2 SWP POP .ZP/tmpX STZ ( tmpX = x coordinate ) + ;ppop JSR2 SWP POP .ZP/tmp2 STZ ( tmp2 = character ) + .ZP/tmp2 LDZ #20 LTH ,&cursor JCN + + #00 .ZP/tmpY LDZ INC2 #0008 MUL2 .Screen/y DEO2 + #00 .ZP/tmpX LDZ INC2 #0008 MUL2 .Screen/x DEO2 + #00 .ZP/tmp2 LDZ #20 SUB #0007 MUL2 .ZP/tmp1 LDZ2 ADD2 .Screen/addr DEO2 + #49 .Screen/sprite DEO + ;CursorSprite .Screen/addr DEO2 + #4a .Screen/sprite DEO + ,&done JMP + &cursor + ;CursorSprite .Screen/addr DEO2 + #00 .ZP/curY LDZ INC2 #0008 MUL2 .Screen/y DEO2 + #00 .ZP/curX LDZ INC2 #0008 MUL2 .Screen/x DEO2 + #4a .Screen/sprite DEO + .ZP/tmpX LDZ .ZP/curX STZ + .ZP/tmpY LDZ .ZP/curY STZ + #00 .ZP/curY LDZ INC2 #0008 MUL2 .Screen/y DEO2 + #00 .ZP/curX LDZ INC2 #0008 MUL2 .Screen/x DEO2 + #4f .Screen/sprite DEO + + &done + ;handler/next JMP2 + +@op-EXECUTE + ;ppop JSR2 .ZP/pc STZ2 + ;handler/next JMP2 + +@op-(key) + .KBuf/read LDZ .KBuf/write LDZ EQU ,&nokey JCN + #00 .KBuf/read LDZ DUP INC #10 MOD .KBuf/read STZ .KBuf/buf ADD LDZ ;ppush JSR2 + #0001 ;ppush JSR2 + ;handler/next JMP2 + &nokey + #0000 ;ppush JSR2 + ;handler/done JMP2 + +@op-R~ + ;rpop JSR2 POP2 + ;handler/next JMP2 + +@op-+ + ;ppop JSR2 ;ppop JSR2 ADD2 ;ppush JSR2 + ;handler/next JMP2 + +@op-- + ;ppop JSR2 ;ppop JSR2 SWP2 SUB2 ;ppush JSR2 + ;handler/next JMP2 + +@op-< + #00 ;ppop JSR2 ;ppop JSR2 GTH2 ;ppush JSR2 + ;handler/next JMP2 + +@op-NOT + #00 ;ppop JSR2 #0000 EQU2 ;ppush JSR2 + ;handler/next JMP2 + +@op-AND + ;ppop JSR2 ;ppop JSR2 AND2 ;ppush JSR2 + ;handler/next JMP2 + +@op-OR + ;ppop JSR2 ;ppop JSR2 ORA2 ;ppush JSR2 + ;handler/next JMP2 + +@op-XOR + ;ppop JSR2 ;ppop JSR2 EOR2 ;ppush JSR2 + ;handler/next JMP2 + +@op-* + ;ppop JSR2 ;ppop JSR2 MUL2 ;ppush JSR2 + ;handler/next JMP2 + +@op-/MOD + ;ppop JSR2 DUP2 ;ppop JSR2 SWP2 OVR2 SWP2 + MOD2 ;ppush JSR2 SWP2 DIV2 ;ppush JSR2 + ;handler/next JMP2 + +@op-QUIT + RS_ADDR .ZP/rsp STZ2 + ;handler/next JMP2 + +@op-ABORT + PS_ADDR .ZP/psp STZ2 + ;handler/next JMP2 + +@op-RCNT + .ZP/rsp LDZ2 RS_ADDR SUB2 HALF2 ;ppush JSR2 + ;handler/next JMP2 + +@op-SCNT + PS_ADDR .ZP/psp LDZ2 SUB2 HALF2 ;ppush JSR2 + ;handler/next JMP2 + +@op-BYE + #ffff .ZP/pc STZ2 + ;handler/done JMP2 + +@op-R@ + .ZP/rsp LDZ2 LDA2 ;ppush JSR2 + ;handler/next JMP2 + +@op-R> + ;rpop JSR2 ;ppush JSR2 + ;handler/next JMP2 + +@op->R + ;ppop JSR2 ;rpush JSR2 + ;handler/next JMP2 + +@op-C@ + #00 ;ppop JSR2 LDA ;ppush JSR2 + ;handler/next JMP2 + +@op-@ + ;ppop JSR2 LDA2 ;ppush JSR2 + ;handler/next JMP2 + +@op-! + ;ppop JSR2 ;ppop JSR2 SWP2 STA2 + ;handler/next JMP2 + +@op-C! + ;ppop JSR2 ;ppop JSR2 SWP2 STA POP + ;handler/next JMP2 + +@op-uxnDEI + ;ppop JSR2 DEI ;ppush JSR2 + ;handler/next JMP2 + +@op-uxnDEO + ;ppop JSR2 SWP POP ;ppop JSR2 SWP POP SWP DEO + ;handler/next JMP2 + +@op-uxnDEI2 + ;ppop JSR2 SWP POP DEI2 ;ppush JSR2 + ;handler/next JMP2 + +@op-uxnDEO2 + ;ppop JSR2 ;ppop JSR2 SWP2 SWP POP DEO2 + ;handler/next JMP2 diff --git a/compile.sh b/compile.sh new file mode 100755 index 0000000..6cbf012 --- /dev/null +++ b/compile.sh @@ -0,0 +1,24 @@ +#!/bin/sh -e +if [ ! -f collapseos/README ]; then + git submodule init + git submodule update +fi +cd collapseos +if [ ! -f tools/blkpack ]; then + git stash push --all + cd tools + make blkpack + cd ../cvm + make stage + cd .. +fi +cd .. +collapseos/tools/blkpack < collapseos/blk.fs > blkfs +collapseos/cvm/stage blkfs collapseos.bin +uxnasm collapseos.tal collapseos.rom +uxnasm cos-lite.tal cos-lite.rom +cat common.tal cos-lite.tal >cos-lite-old.tal +patch >cos-lite.rom +cat collapseos.bin >>cos-lite-old.rom \ No newline at end of file diff --git a/cos-lite-old.patch b/cos-lite-old.patch new file mode 100644 index 0000000..26f22d0 --- /dev/null +++ b/cos-lite-old.patch @@ -0,0 +1,77 @@ +--- cos-lite-old.tal ++++ cos-lite-old.tal +@@ -1,3 +1,6 @@ ++( collapseOS without filesystem support - for old uxnasm commit 8d14b4bbc6f1e50f313293ba301268fbc7d9090e ++ for https://aduros.com/webuxn/ ) ++ + ( constants ) + %SYSVARS+#18 { #fe18 } + %RS_ADDR { #ff00 } +@@ -9,6 +12,9 @@ + %RTN { JMP2r } + %HALF2 { DUP2 #8000 AND2 #01 SFT2 ORA2 } ( signed division by 2 ) + ++%INC2 { #0001 ADD2 } ++%INC { #01 ADD } ++ + ( zero page ) + |00 @ZP [ &psp $2 &rsp $2 &ir $2 &pc $2 &curX $1 &curY $1 &tmpX $1 &tmpY $1 &tmp1 $2 &tmp2 $2 ] + +@@ -21,7 +27,7 @@ + ( devices ) + |00 @System [ &vector $2 &wst $1 &rst $1 &pad $4 &r $2 &g $2 &b $2 &debug $1 &halt $1 ] + |10 @Console [ &vector $2 &read $1 &pad $5 &write $1 &error $1 ] +-|20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &pixel $1 &sprite $1 ] ++|20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ] + |80 @Controller [ &vector $2 &button $1 &key $1 ] + + ( stable ABI ) +@@ -213,20 +219,20 @@ + #00 .ZP/tmpY LDZ INC2 #0008 MUL2 .Screen/y DEO2 + #00 .ZP/tmpX LDZ INC2 #0008 MUL2 .Screen/x DEO2 + #00 .ZP/tmp2 LDZ #20 SUB #0007 MUL2 .ZP/tmp1 LDZ2 ADD2 .Screen/addr DEO2 +- #49 .Screen/sprite DEO ++ #29 .Screen/color DEO + ;CursorSprite .Screen/addr DEO2 +- #4a .Screen/sprite DEO ++ #32 .Screen/color DEO + ,&done JMP + &cursor + ;CursorSprite .Screen/addr DEO2 + #00 .ZP/curY LDZ INC2 #0008 MUL2 .Screen/y DEO2 + #00 .ZP/curX LDZ INC2 #0008 MUL2 .Screen/x DEO2 +- #4a .Screen/sprite DEO ++ #32 .Screen/color DEO + .ZP/tmpX LDZ .ZP/curX STZ + .ZP/tmpY LDZ .ZP/curY STZ + #00 .ZP/curY LDZ INC2 #0008 MUL2 .Screen/y DEO2 + #00 .ZP/curX LDZ INC2 #0008 MUL2 .Screen/x DEO2 +- #4f .Screen/sprite DEO ++ #31 .Screen/color DEO + + &done + ;handler/next JMP2 +@@ -348,8 +354,6 @@ + @op-uxnDEO2 + ;ppop JSR2 ;ppop JSR2 SWP2 SWP POP DEO2 + ;handler/next JMP2 +-( collapseOS without filesystem support ) +-~common.tal + + @blkinit RTN + +@@ -383,12 +387,12 @@ + OVR INC #00 SWP #0008 MUL2 .Screen/y DEO2 + &cellloop + DUP INC #00 SWP #0008 MUL2 .Screen/x DEO2 +- #49 .Screen/sprite DEO ++ #29 .Screen/color DEO + INC DUP #50 LTH ,&cellloop JCN + POP INC #00 OVR #19 LTH ,&lineloop JCN + POP2 + ( dummy device-out as replacement for loading ROM ) +- #0000 .System/vector ++ ;key-handler .Controller/vector + ( go to main program ) + ;main JMP2 + diff --git a/cos-lite.tal b/cos-lite.tal new file mode 100644 index 0000000..35b3982 --- /dev/null +++ b/cos-lite.tal @@ -0,0 +1,45 @@ +( collapseOS without filesystem support ) +~common.tal + +@blkinit RTN + +@op-uxnStorage ;handler/stop JMP2 + +@init + ( initialize zero page ) + PS_ADDR .ZP/psp STZ2 + RS_ADDR .ZP/rsp STZ2 + #ffff .ZP/ir STZ2 + ;ROMSTART .ZP/pc STZ2 + #00 .KBuf/read STZ + #00 .KBuf/write STZ + #00 .KBuf/altgr-flag STZ + #00 .ZP/curX STZ + #00 .ZP/curY STZ + ( initialize theme ) + #0f0f .System/r DEO2 + #0f0f .System/g DEO2 + #0ff0 .System/b DEO2 + + ( initialize and clear screen ) + #0290 .Screen/width DEO2 + #00d8 .Screen/height DEO2 + .EmptySprite #00 + &clearloop ADDk #00 SWP STZ INC DUP #08 LTH ,&clearloop JCN + ADD #fe SWP STZ + ;EmptySprite .Screen/addr DEO2 + #00 #00 ( stack: y x ) + &lineloop + OVR INC #00 SWP #0008 MUL2 .Screen/y DEO2 + &cellloop + DUP INC #00 SWP #0008 MUL2 .Screen/x DEO2 + #49 .Screen/sprite DEO + INC DUP #50 LTH ,&cellloop JCN + POP INC #00 OVR #19 LTH ,&lineloop JCN + POP2 + ( dummy device-out as replacement for loading ROM ) + #0000 .System/vector + ( go to main program ) + ;main JMP2 + +|07fe @ROMSTART 00 00 diff --git a/xcomp.fs b/xcomp.fs new file mode 100644 index 0000000..520258c --- /dev/null +++ b/xcomp.fs @@ -0,0 +1,77 @@ +2 CONSTS $fffa PS_ADDR $ff00 RS_ADDR +$fe00 VALUE SYSVARS \ synced with vm.c +SYSVARS $409 - VALUE BLK_MEM +SYSVARS $80 + VALUE GRID_MEM +GRID_MEM 2 + VALUE RXTX_MEM + +XCOMP FONTC + +1 TO BIGEND? + +: JMP(i), 17 C, M, ; +: JMPi, 11 C, M, ; +: CALLi, 10 C, M, ; +: i>, 2 C, M, ; +: (i)>, 3 C, M, ; + +XCOMPC + +$0800 XSTART + +0 JMPi, PC 2 - TO lblboot +PC TO lblnext PC TO lblcell 7 C, +PC TO lblxt 12 C, +PC TO lbldoes 18 C, +PC TO lblval 19 C, + +CODE * 32 C, ;CODE CODE /MOD 34 C, ;CODE +CODE QUIT PC 35 C, 0 JMPi, PC 2 - TO lblmain +CODE ABORT 36 C, JMPi, ( to QUIT ) +CODE EXIT 13 C, ;CODE CODE BYE 43 C, +CODE RCNT 37 C, ;CODE CODE SCNT 42 C, ;CODE +CODE (br) 30 C, ;CODE CODE (?br) 8 C, ;CODE +CODE (next) 9 C, ;CODE +CODE (b) 15 C, ;CODE CODE (n) 16 C, ;CODE + +CODE C@ 47 C, ;CODE CODE @ 48 C, ;CODE +CODE C! 50 C, ;CODE CODE ! 49 C, ;CODE +CODE NOT 38 C, ;CODE +CODE AND 39 C, ;CODE CODE OR 40 C, ;CODE +CODE XOR 41 C, ;CODE +CODE + 28 C, ;CODE CODE - 29 C, ;CODE +CODE < 33 C, ;CODE +CODE R@ 44 C, ;CODE CODE R~ 26 C, ;CODE +CODE R> 45 C, ;CODE CODE >R 46 C, ;CODE + +CODE DUP 0 C, ;CODE CODE DROP 1 C, ;CODE +CODE ?DUP 14 C, ;CODE +CODE SWAP 4 C, ;CODE CODE OVER 5 C, ;CODE +CODE ROT 6 C, ;CODE +CODE TICKS ;CODE +CODE EXECUTE 21 C, ;CODE +CODE uxnDEI 24 C, ;CODE +CODE uxnDEO 25 C, ;CODE +CODE uxnDEI2 27 C, ;CODE +CODE uxnDEO2 31 C, ;CODE + +COREL + +CREATE ~FNT CPFNT7x7 + +CODE (key?) 22 C, ;CODE +CODE uxnStorage 23 C, ;CODE ( n blk( r/w ) + +: (blk@) 1 uxnStorage ; +: (blk!) 2 uxnStorage ; + +BLKSUB + +CODE uxnCell 20 C, ;CODE ( c x y fnt -- ) + +: COLS 80 ; : LINES 25 ; +: CELL! ( c pos -- ) COLS /MOD ~FNT uxnCell ; +: CURSOR! ( new old -- ) DROP 0 SWAP CELL! ; + +GRIDSUB +: INIT BLK$ GRID$ ; +XWRAP