summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--CHANGELOG.txt (renamed from changelog.md)9
-rw-r--r--CMakeLists.txt122
-rw-r--r--COPYING661
-rw-r--r--Cargo.toml17
-rw-r--r--bootloader.lumabin5 -> 0 bytes
-rw-r--r--cartridge.lumabin39 -> 0 bytes
-rw-r--r--luma/src/luma.h77
-rw-r--r--luma/src/luma_abrt.c29
-rw-r--r--luma/src/luma_checkEvts.c36
-rw-r--r--luma/src/luma_dat.c22
-rw-r--r--luma/src/luma_drwVram.c40
-rw-r--r--luma/src/luma_initDat.c27
-rw-r--r--luma/src/luma_initWin.c29
-rw-r--r--luma/src/luma_ldBank.c26
-rw-r--r--luma/src/luma_ldBootlder.c25
-rw-r--r--luma/src/luma_ldRom.c32
-rw-r--r--luma/src/luma_mem.c41
-rw-r--r--luma/src/luma_memDump.c32
-rw-r--r--luma/src/luma_proc.c555
-rw-r--r--luma/src/luma_setByte.c32
-rw-r--r--luma/src/luma_setDbl.c25
-rw-r--r--luma/src/main.c52
-rw-r--r--src/luma.rs30
-rw-r--r--src/luma/app.rs15
-rw-r--r--src/luma/app/emu.rs64
-rw-r--r--src/luma/app/end.rs21
-rw-r--r--src/luma/app/ini.rs16
-rw-r--r--src/luma/app/new.rs17
-rw-r--r--src/luma/app/prspar.rs26
-rw-r--r--src/luma/app/run.rs44
-rw-r--r--src/luma/app/trp.rs29
-rw-r--r--src/main.rs10
33 files changed, 302 insertions, 1866 deletions
diff --git a/.gitignore b/.gitignore
index 90eaf89..1369b23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-/build
-/memdump
+*.agb
+vgcore.*
+/target
/old
-vgcore.* \ No newline at end of file
+Cargo.lock
diff --git a/changelog.md b/CHANGELOG.txt
index c87b46b..6c0152c 100644
--- a/changelog.md
+++ b/CHANGELOG.txt
@@ -1,3 +1,12 @@
+# 0.26
+
+* Repurpose project for emulating the AGB;
+* Make changelog plain-text (rename to CHANGELOG.txt);
+* Write in Rust;
+* Update gitignore;
+* Use Git tagging;
+* Update versioning: major.minor;
+
# 25
* Fix logs being forced disabled.
diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index 1cf6af2..0000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,122 +0,0 @@
-cmake_minimum_required(
- VERSION
- 3.22
-)
-project(
- luma
- VERSION
- 24
- DESCRIPTION
- "Reference emulator for the luma platform."
- HOMEPAGE_URL
- "https://mandelbrot.dk/luma"
- LANGUAGES
- C
-)
-set(
- CMAKE_C_STANDARD
- 11
-)
-
-# Disable in-souce builds:
-if(
- "${PROJECT_BINARY_DIR}"
- STREQUAL
- "${PROJECT_SOURCE_DIR}"
-)
- message(
- FATAL_ERROR
- "Building in the source tree is not allowed."
- )
-endif()
-
-# Dependencies:
-find_package(
- SDL2
- REQUIRED
-)
-
-# Include directories:
-include_directories(
- "${PROJECT_SOURCE_DIR}/include"
- "${SDL2_INCLUDE_DIRS}"
-)
-
-# Enable compiler warnings:
-if(
- MSVC
-)
- add_compile_options(
- "/W4"
- "/WX"
- )
-else()
- add_compile_options(
- "-pedantic-errors"
- "-Wfatal-errors"
- "-Wall"
- "-Wconversion"
- "-Werror"
- "-Wextra"
- "-Wunreachable-code"
- "-Wunused"
- )
- if(
- "${CMAKE_CXX_COMPILER_ID}"
- STREQUAL
- "Clang"
- )
- add_compile_options(
- "-Wnewline-eof"
- )
- endif()
-endif()
-
-# Set compiler optimisations level:
-if(
- CMAKE_BUILD_TYPE
- MATCHES
- Release
-)
- message(
- STATUS
- "Setting optimisation level..."
- )
- if(
- MSVC
- )
- add_compile_options(
- "/Os"
- )
- else()
- add_compile_options(
- "-Os"
- )
- endif()
-endif()
-
-# Sources:
-add_executable(
- luma
- "luma/src/luma_abrt.c"
- "luma/src/luma_checkEvts.c"
- "luma/src/luma_dat.c"
- "luma/src/luma_drwVram.c"
- "luma/src/luma_initDat.c"
- "luma/src/luma_initWin.c"
- "luma/src/luma_ldBank.c"
- "luma/src/luma_ldBootlder.c"
- "luma/src/luma_ldRom.c"
- "luma/src/luma_mem.c"
- "luma/src/luma_memDump.c"
- "luma/src/luma_proc.c"
- "luma/src/luma_setByte.c"
- "luma/src/luma_setDbl.c"
- "luma/src/main.c"
-)
-
-# Link Libraries:
-target_link_libraries(
- luma
- ${SDL2_LIBRARIES}
-)
diff --git a/COPYING b/COPYING
deleted file mode 100644
index be3f7b2..0000000
--- a/COPYING
+++ /dev/null
@@ -1,661 +0,0 @@
- GNU AFFERO GENERAL PUBLIC LICENSE
- Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-our General Public Licenses are 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.
-
- 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.
-
- Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
- A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate. Many developers of free software are heartened and
-encouraged by the resulting cooperation. However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
- The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community. It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server. Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
- An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals. This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
- 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
-
- Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software. This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
- 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 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 work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero 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 Affero 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 Affero 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 Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source. For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code. There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
- 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 AGPL, see
-<https://www.gnu.org/licenses/>.
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..6528a73
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "luma"
+version = "0.30.0"
+edition = "2021"
+
+[[bin]]
+name = "luma"
+path = "src/main.rs"
+
+[profile.dev]
+overflow-checks = false
+
+[profile.release]
+lto = true
+
+[dependencies]
+libc = "0.2.146"
diff --git a/bootloader.luma b/bootloader.luma
deleted file mode 100644
index c8df2f9..0000000
--- a/bootloader.luma
+++ /dev/null
Binary files differ
diff --git a/cartridge.luma b/cartridge.luma
deleted file mode 100644
index 35adbc2..0000000
--- a/cartridge.luma
+++ /dev/null
Binary files differ
diff --git a/luma/src/luma.h b/luma/src/luma.h
deleted file mode 100644
index d26f2b9..0000000
--- a/luma/src/luma.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- Copyright 2021, 2022 Gabriel Jensen
-
- This file is part of luma.
-
- luma is free software: you can redistribute it and/or modify it under the
- terms of the GNU Affero General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- luma 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 Affero General Public License
- along with luma. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#if !defined(luma_hdr_luma)
-#define luma_hdr_luma
-
-#include <SDL2/SDL.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-
-#define luma_ver 0x1D
-
-typedef uint8_t luma_byte;
-typedef uint16_t luma_dbl;
-
-typedef struct {
- char const * bootlder;
- char const * cart;
- bool dead;
- luma_dbl instrPtr;
- SDL_Surface * srf;
- SDL_Window * win;
-} luma_dattyp;
-extern luma_dattyp luma_dat;
-
-extern luma_byte luma_mem[0x10000]; /* 65536-bit address space. */
-
-#define luma_result (luma_mem[0xE800])
-#define luma_param0 (luma_mem[0xE801])
-#define luma_param1 (luma_mem[0xE802])
-#define luma_param2 (luma_mem[0xE803])
-#define luma_param3 (luma_mem[0xE804])
-#define luma_param4 (luma_mem[0xE805])
-#define luma_param5 (luma_mem[0xE806])
-#define luma_param6 (luma_mem[0xE807])
-#define luma_param7 (luma_mem[0xE808])
-#define luma_rnd (luma_mem[0xE809])
-
-#define luma_getDbl(_addr) ((luma_dbl)(luma_mem[_addr] | ((luma_dbl)(luma_mem[_addr + 0x1]) << 0x8)))
-
-_Noreturn void luma_abrt( void);
- bool luma_checkEvts( void);
- void luma_drwVram( void);
- void luma_initDat( void);
- bool luma_initWin( void);
- void luma_ldBank( luma_byte num);
- void luma_ldBootlder(void);
- void luma_ldRom( char const * file,luma_byte banknum,luma_dbl addr);
- void luma_memDump( void);
- void luma_proc( void);
- void luma_setByte( luma_dbl addr,luma_byte val);
- void luma_setDbl( luma_dbl addr,luma_dbl val);
-
-#if defined(NDEBUG)
-#define luma_log(...)
-#else
-#define luma_log(...) (fprintf(stderr,__VA_ARGS__))
-#endif
-
-#endif
diff --git a/luma/src/luma_abrt.c b/luma/src/luma_abrt.c
deleted file mode 100644
index dca1d4d..0000000
--- a/luma/src/luma_abrt.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- Copyright 2021, 2022 Gabriel Jensen
-
- This file is part of luma.
-
- luma is free software: you can redistribute it and/or modify it under the
- terms of the GNU Affero General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- luma 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 Affero General Public License
- along with luma. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "luma.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-void luma_abrt(void) {
- fprintf(stderr,"Abort invoked\n");
- luma_memDump();
- exit(EXIT_FAILURE);
-}
diff --git a/luma/src/luma_checkEvts.c b/luma/src/luma_checkEvts.c
deleted file mode 100644
index c1d3231..0000000
--- a/luma/src/luma_checkEvts.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- Copyright 2021, 2022 Gabriel Jensen
-
- This file is part of luma.
-
- luma is free software: you can redistribute it and/or modify it under the
- terms of the GNU Affero General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- luma 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 Affero General Public License
- along with luma. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "luma.h"
-
-#include <SDL2/SDL.h>
-#include <stdbool.h>
-
-bool luma_checkEvts(void) {
- SDL_Event evt;
- while (SDL_PollEvent(&evt)) {
- switch (evt.type) {
- default:
- break;
- case SDL_QUIT:
- return true;
- }
- }
- return false;
-}
diff --git a/luma/src/luma_dat.c b/luma/src/luma_dat.c
deleted file mode 100644
index 358bd08..0000000
--- a/luma/src/luma_dat.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- Copyright 2021, 2022 Gabriel Jensen
-
- This file is part of luma.
-
- luma is free software: you can redistribute it and/or modify it under the
- terms of the GNU Affero General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- luma 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 Affero General Public License
- along with luma. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "luma.h"
-
-luma_dattyp luma_dat;
diff --git a/luma/src/luma_drwVram.c b/luma/src/luma_drwVram.c
deleted file mode 100644
index 4019ff1..0000000
--- a/luma/src/luma_drwVram.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- Copyright 2021, 2022 Gabriel Jensen
-
- This file is part of luma.
-
- luma is free software: you can redistribute it and/or modify it under the
- terms of the GNU Affero General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- luma 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 Affero General Public License
- along with luma. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "luma.h"
-
-#include <SDL2/SDL.h>
-
-#include <stdio.h>
-
-void luma_drwVram(void) {
- SDL_Rect rect;
- rect.w = 0x4;
- rect.h = 0x4;
- for (luma_dbl y = 0x0;y < 0x80;y += 0x1) {
- rect.y = y * 0x4;
- for (luma_dbl x = 0x0;x < 0x80;x += 0x1) {
- rect.x = x * 0x4;
- luma_byte const memVal = luma_mem[0x8000 + x + y * 0x80];
- Uint32 const col = (Uint32)((memVal << 0x10) + (memVal << 0x8) + memVal);
- SDL_FillRect(luma_dat.srf,&rect,col);
- }
- }
- SDL_UpdateWindowSurface(luma_dat.win);
-}
diff --git a/luma/src/luma_initDat.c b/luma/src/luma_initDat.c
deleted file mode 100644
index c5c0b02..0000000
--- a/luma/src/luma_initDat.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- Copyright 2021, 2022 Gabriel Jensen
-
- This file is part of luma.
-
- luma is free software: you can redistribute it and/or modify it under the
- terms of the GNU Affero General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- luma 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 Affero General Public License
- along with luma. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "luma.h"
-
-void luma_initDat(void) {
- luma_dat.bootlder = "bootloader.luma";
- luma_dat.cart = "cartridge.luma";
- luma_dat.dead = false;
- luma_dat.instrPtr = 0x0;
-}
diff --git a/luma/src/luma_initWin.c b/luma/src/luma_initWin.c
deleted file mode 100644
index 26e5246..0000000
--- a/luma/src/luma_initWin.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- Copyright 2021, 2022 Gabriel Jensen
-
- This file is part of luma.
-
- luma is free software: you can redistribute it and/or modify it under the
- terms of the GNU Affero General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- luma 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 Affero General Public License
- along with luma. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "luma.h"
-
-#include <SDL2/SDL.h>
-
-bool luma_initWin(void) {
- SDL_Init(SDL_INIT_VIDEO);
- luma_dat.win = SDL_CreateWindow("luma",SDL_WINDOWPOS_UNDEFINED,SDL_WINDOWPOS_UNDEFINED,0x200,0x200,0x0);
- luma_dat.srf = SDL_GetWindowSurface(luma_dat.win);
- return false;
-}
diff --git a/luma/src/luma_ldBank.c b/luma/src/luma_ldBank.c
deleted file mode 100644
index f1f2616..0000000
--- a/luma/src/luma_ldBank.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- Copyright 2021, 2022 Gabriel Jensen
-
- This file is part of luma.
-
- luma is free software: you can redistribute it and/or modify it under the
- terms of the GNU Affero General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- luma 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 Affero General Public License
- along with luma. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "luma.h"
-
-#include <stdio.h>
-
-void luma_ldBank(luma_byte const _num) {
- luma_ldRom(luma_dat.cart,_num,_num == 0x0 ? 0x2000 : 0x0);
-}
diff --git a/luma/src/luma_ldBootlder.c b/luma/src/luma_ldBootlder.c
deleted file mode 100644
index 391ff2d..0000000
--- a/luma/src/luma_ldBootlder.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- Copyright 2021, 2022 Gabriel Jensen
-
- This file is part of luma.
-
- luma is free software: you can redistribute it and/or modify it under the
- terms of the GNU Affero General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- luma 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 Affero General Public License
- along with luma. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "luma.h"
-
-void luma_ldBootlder(void) {
- luma_log("Loading boot loader \"%s\"\n",luma_dat.bootlder);
- luma_ldRom(luma_dat.bootlder,0x0,0x0);
-}
diff --git a/luma/src/luma_ldRom.c b/luma/src/luma_ldRom.c
deleted file mode 100644
index 88c0a13..0000000
--- a/luma/src/luma_ldRom.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Copyright 2021, 2022 Gabriel Jensen
-
- This file is part of luma.
-
- luma is free software: you can redistribute it and/or modify it under the
- terms of the GNU Affero General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- luma 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 Affero General Public License
- along with luma. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "luma.h"
-
-#include <inttypes.h>
-#include <stdio.h>
-
-void luma_ldRom(char const * const restrict _file,luma_byte const _num,luma_dbl const _addr) {
- (void)_num;
- luma_log("Loading bank %" PRIX8 " of ROM file \"%s\" into address space at %" PRIX16 "\n",_num,_file,_addr);
- FILE * file = fopen(_file,"r");
- void * const buf = luma_mem + _addr;
- fread(buf,sizeof (luma_byte),0x4000,file);
- fclose(file);
-}
diff --git a/luma/src/luma_mem.c b/luma/src/luma_mem.c
deleted file mode 100644
index 854976d..0000000
--- a/luma/src/luma_mem.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- Copyright 2021, 2022 Gabriel Jensen
-
- This file is part of luma.
-
- luma is free software: you can redistribute it and/or modify it under the
- terms of the GNU Affero General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- luma 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 Affero General Public License
- along with luma. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "luma.h"
-
-/*
- ADDRESS SPACE:
- 0000-3FFF : BOOTLOADER OR CARTRIDGE ROM BANK 01-FF
- 4000-7FFF : CARTRIDGE ROM BANK 00
- 8000-BFFF : VRAM
- C000-DFFF : SYSTEM RAM
- E000-E7FF : CARTRIDGE RAM
- E800-E800 : RESULT REGISTER
- E801-E801 : GENERAL REGISTER 0
- E802-E802 : GENERAL REGISTER 1
- E803-E803 : GENERAL REGISTER 2
- E804-E804 : GENERAL REGISTER 3
- E805-E805 : GENERAL REGISTER 4
- E806-E806 : GENERAL REGISTER 5
- E807-E807 : GENERAL REGISTER 6
- E808-E808 : GENERAL REGISTER 7
- E809-E809 : RANDOM REGISTER
- E90A-FFFF : NOTHING
-*/
-luma_byte luma_mem[0x10000];
diff --git a/luma/src/luma_memDump.c b/luma/src/luma_memDump.c
deleted file mode 100644
index 253618a..0000000
--- a/luma/src/luma_memDump.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Copyright 2021, 2022 Gabriel Jensen
-
- This file is part of luma.
-
- luma is free software: you can redistribute it and/or modify it under the
- terms of the GNU Affero General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- luma 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 Affero General Public License
- along with luma. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "luma.h"
-
-#include <stdio.h>
-
-void luma_memDump(void) {
- fprintf(stderr,"Creating memory dump...");
- FILE * file = fopen("memdump","w");
- if (fwrite(luma_mem,sizeof (luma_byte),0x10000,file) < 0x10000) {
- luma_abrt();
- }
- fclose(file);
- fputs(" done\n",stderr);
-}
diff --git a/luma/src/luma_proc.c b/luma/src/luma_proc.c
deleted file mode 100644
index ef42ace..0000000
--- a/luma/src/luma_proc.c
+++ /dev/null
@@ -1,555 +0,0 @@
-/*
- Copyright 2021, 2022 Gabriel Jensen
-
- This file is part of luma.
-
- luma is free software: you can redistribute it and/or modify it under the
- terms of the GNU Affero General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- luma 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 Affero General Public License
- along with luma. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "luma.h"
-
-#include <inttypes.h>
-#include <stdio.h>
-#include <string.h>
-
-/*
- OPCODES:
- HEX : NAME : PARAMETERS : FULL NAME
-
- 00 : IGN : : IGNORE
- 01 : CPY : ptr ,ptr : COPY
- 02 : SET : ptr ,byte : SET
- 03 : INC : ptr : INCREMENT
- 04 : DEC : ptr : DECREMENT
- 05 : JMP : ptr : JUMP
- 06 : DIE : : DIE
- 07 : BNK : byte : LOAD BANK
- 08 : TRP : : TRAP
- 09 : CMP : ptr ,ptr : COMPARE
- 0A : JEQ : ptr : JUMP IF EQUAL
- 0B : JLT : ptr : JUMP IF LESS THAN
- 0C : JGT : ptr : JUMP IF GREATER THAN
- 0D : JLE : ptr : JUMP IF LESS THAN OR EQUAL
- 0E : JGE : ptr : JUMP IF GREATER THAN OR EQUAL
- 0F : ICD : ptr : INCREMENT DOUBLE
- 10 : DCD : ptr : DECREMENT DOUBLE
- 11 : CPD : ptr ,ptr : COMPARE DOUBLE
- 12 : ADB : ptr ,ptr : ADD BYTE
- 13 : ADD : ptr ,ptr : ADD DOUBLE
- 14 : SUB : ptr ,ptr : SUBTRACT
- 15 : SBD : ptr ,ptr : SUBTRACT DOUBLE
- 16 : MUL : ptr ,ptr : MULTIPLY
- 17 : MLD : ptr ,ptr : MULTIPLY DOUBLE
- 18 : DIV : ptr ,ptr : DIVIDE
- 19 : DVD : ptr ,ptr : DIVIDE DOUBLE
- 1A : OUT : byte,ptr : OUTPUT
- 1B : INP : byte,ptr : INPUT
- 1C : DRW : : DRAW
- 1D : CPP : ptr ,byte : COPY POINTER
- 1E : STP : ptr ,byte : SET POINTER
-*/
-
-typedef void (* luma_opcdHandlTer)(void);
-
-static void luma_opcdHandl_ilg(void);
-static void luma_opcdHandl_ign(void);
-static void luma_opcdHandl_cpy(void);
-static void luma_opcdHandl_set(void);
-static void luma_opcdHandl_inc(void);
-static void luma_opcdHandl_dec(void);
-static void luma_opcdHandl_jmp(void);
-static void luma_opcdHandl_die(void);
-static void luma_opcdHandl_bnk(void);
-static void luma_opcdHandl_trp(void);
-static void luma_opcdHandl_cmp(void);
-static void luma_opcdHandl_jeq(void);
-static void luma_opcdHandl_jlt(void);
-static void luma_opcdHandl_jgt(void);
-static void luma_opcdHandl_jle(void);
-static void luma_opcdHandl_jge(void);
-static void luma_opcdHandl_icd(void);
-static void luma_opcdHandl_dcd(void);
-static void luma_opcdHandl_cpd(void);
-static void luma_opcdHandl_drw(void);
-static void luma_opcdHandl_cpp(void);
-static void luma_opcdHandl_stp(void);
-
-luma_opcdHandlTer luma_opcdHandls[0x100] = {
- luma_opcdHandl_ign,
- luma_opcdHandl_cpy,
- luma_opcdHandl_set,
- luma_opcdHandl_inc,
- luma_opcdHandl_dec,
- luma_opcdHandl_jmp,
- luma_opcdHandl_die,
- luma_opcdHandl_bnk,
- luma_opcdHandl_trp,
- luma_opcdHandl_cmp,
- luma_opcdHandl_jeq,
- luma_opcdHandl_jlt,
- luma_opcdHandl_jgt,
- luma_opcdHandl_jle,
- luma_opcdHandl_jge,
- luma_opcdHandl_icd,
- luma_opcdHandl_dcd,
- luma_opcdHandl_cpd,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_drw,
- luma_opcdHandl_cpp,
- luma_opcdHandl_stp,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
- luma_opcdHandl_ilg,
-};
-
-void luma_proc() {
- luma_opcdHandls[luma_mem[luma_dat.instrPtr]]();
- luma_dat.instrPtr += 0x1;
-}
-
-static void luma_opcdHandl_ilg(void) {
- fprintf(stderr,"! ILG-%" PRIX8 " @%" PRIX16 "\n",luma_mem[luma_dat.instrPtr],luma_dat.instrPtr);
-}
-
-static void luma_opcdHandl_ign(void) {}
-
-static void luma_opcdHandl_cpy(void) {
- luma_dbl const dest = luma_getDbl(luma_dat.instrPtr + 0x1);
- luma_dbl const src = luma_getDbl(luma_dat.instrPtr + 0x3);
- luma_log("CPY @%" PRIX16 " %" PRIX16 " %" PRIX16 "\n",luma_dat.instrPtr,src,dest);
- luma_setByte(dest,luma_mem[src]);
- luma_dat.instrPtr += 0x4;
-}
-
-static void luma_opcdHandl_set(void) {
- luma_dbl const dest = luma_getDbl(luma_dat.instrPtr + 0x1);
- luma_byte const val = luma_mem[luma_dat.instrPtr + 0x3];
- luma_log("SET @%" PRIX16 " %" PRIX16 " %" PRIX8 "\n",luma_dat.instrPtr,dest,val);
- luma_setByte(dest,val);
- luma_dat.instrPtr += 0x3;
-}
-
-static void luma_opcdHandl_inc(void) {
- luma_dbl const addr = luma_getDbl(luma_dat.instrPtr + 0x1);
- luma_byte const val = luma_mem[addr];
- luma_log("INC %" PRIX16 "=%" PRIX8 "\n",addr,val);
- luma_setByte(addr,val + 0x1);
- luma_dat.instrPtr += 0x2;
-}
-
-static void luma_opcdHandl_dec(void) {
- luma_dbl const addr = luma_getDbl(luma_dat.instrPtr + 0x1);
- luma_byte const val = luma_mem[addr];
- luma_log("DEC %" PRIX16 "=%" PRIX8 "\n",addr,val);
- luma_setByte(addr,val - 0x1);
- luma_dat.instrPtr += 0x2;
-}
-
-static void luma_opcdHandl_jmp(void) {
- luma_dbl const dest = luma_getDbl(luma_dat.instrPtr + 0x1);
- luma_log("JMP @%" PRIX16 " %" PRIX16 "\n",luma_dat.instrPtr,dest);
- luma_dat.instrPtr = dest - 0x1; /* Compensate for the incremention by luma_proc. */
-}
-
-static void luma_opcdHandl_die(void) {
- luma_log("DIE @%" PRIX16 "\n",luma_dat.instrPtr);
- luma_dat.dead = true;
-}
-
-static void luma_opcdHandl_bnk(void) {
- luma_byte const banknum = luma_mem[luma_dat.instrPtr + 0x1];
- luma_log("BNK @%" PRIX16 " %" PRIX8 "\n",luma_dat.instrPtr,banknum);
- luma_ldBank(banknum);
- luma_dat.instrPtr += 0x1;
-}
-
-static void luma_opcdHandl_trp(void) {
- luma_log("TRP @%" PRIX16 "\n",luma_dat.instrPtr);
- luma_memDump();
- for (;;) {}
-}
-
-static void luma_opcdHandl_cmp(void) {
- luma_dbl const laddr = luma_getDbl(luma_dat.instrPtr + 0x1);
- luma_dbl const raddr = luma_getDbl(luma_dat.instrPtr + 0x3);
- luma_byte const lval = luma_mem[laddr];
- luma_byte const rval = luma_mem[raddr];
- luma_log("CMP @%" PRIX16 " %" PRIX8 "=%" PRIX8 " %" PRIX8 "=%" PRIX8 ": ",luma_dat.instrPtr,laddr,lval,raddr,rval);
- if (lval < rval) {
- luma_result = 0x0;
- }
- else if (lval > rval) {
- luma_result = 0x2;
- }
- else {
- luma_result = 0x1;
- }
- luma_log("%" PRIX8 "\n",luma_result);
- luma_dat.instrPtr += 0x4;
-}
-
-static void luma_opcdHandl_jeq(void) {
- luma_log("JEQ @%" PRIX16 ": ",luma_dat.instrPtr);
- if (luma_result == 0x1) {
- luma_dbl const dest = luma_getDbl(luma_dat.instrPtr + 0x1);
- luma_log("%" PRIX16 "\n",dest);
- luma_dat.instrPtr = dest - 0x1;
- }
- else {
- luma_log("%" PRIX16 "\n",luma_dat.instrPtr);
- luma_dat.instrPtr += 0x2;
- }
-}
-
-static void luma_opcdHandl_jlt(void) {
- luma_log("JLT @%" PRIX16 ": ",luma_dat.instrPtr);
- if (luma_result == 0x0) {
- luma_dbl const dest = luma_getDbl(luma_dat.instrPtr + 0x1);
- luma_log("%" PRIX16 "\n",dest);
- luma_dat.instrPtr = dest - 0x1;
- }
- else {
- luma_log("%" PRIX16 "\n",luma_dat.instrPtr);
- luma_dat.instrPtr += 0x2;
- }
-}
-
-static void luma_opcdHandl_jgt(void) {
- luma_log("JGT @%" PRIX16 ": ",luma_dat.instrPtr);
- if (luma_result == 0x2) {
- luma_dbl const dest = luma_getDbl(luma_dat.instrPtr + 0x1);
- luma_log("%" PRIX16 "\n",dest);
- luma_dat.instrPtr = dest - 0x1;
- }
- else {
- luma_log("%" PRIX16 "\n",luma_dat.instrPtr);
- luma_dat.instrPtr += 0x2;
- }
-}
-
-static void luma_opcdHandl_jle(void) {
- luma_log("JLE @%" PRIX16 ": ",luma_dat.instrPtr);
- if (luma_result == 0x0 || luma_result == 0x1) {
- luma_dbl const dest = luma_getDbl(luma_dat.instrPtr + 0x1);
- luma_log("%" PRIX16 "\n",dest);
- luma_dat.instrPtr = dest - 0x1;
- }
- else {
- luma_log("%" PRIX16 "\n",luma_dat.instrPtr);
- luma_dat.instrPtr += 0x2;
- }
-}
-
-static void luma_opcdHandl_jge(void) {
- luma_log("JGE @%" PRIX16 ": ",luma_dat.instrPtr);
- if (luma_result == 0x2 || luma_result == 0x1) {
- luma_dbl const dest = luma_getDbl(luma_dat.instrPtr + 0x1);
- luma_log("%" PRIX16 "\n",dest);
- luma_dat.instrPtr = dest - 0x1;
- }
- else {
- luma_log("%" PRIX16 "\n",luma_dat.instrPtr);
- luma_dat.instrPtr += 0x2;
- }
-}
-
-static void luma_opcdHandl_icd(void) {
- luma_dbl const addr = luma_getDbl(luma_dat.instrPtr + 0x1);
- luma_dbl const val = luma_getDbl(addr);
- luma_log("ICD @%" PRIX16 " %" PRIX16 "=%" PRIX16 "\n",luma_dat.instrPtr,addr,val);
- luma_setDbl(addr,val + 0x1);
- luma_dat.instrPtr += 0x2;
-}
-
-static void luma_opcdHandl_dcd(void) {
- luma_dbl const addr = luma_getDbl(luma_dat.instrPtr + 0x1);
- luma_dbl const val = luma_getDbl(addr);
- luma_log("DCD @%" PRIX16 " %" PRIX16 "=%" PRIX16 "\n",luma_dat.instrPtr,addr,val);
- luma_setDbl(addr,val - 0x1);
- luma_dat.instrPtr += 0x2;
-}
-
-static void luma_opcdHandl_cpd(void) {
- luma_dbl const laddr = luma_getDbl(luma_dat.instrPtr + 0x1);
- luma_dbl const raddr = luma_getDbl(luma_dat.instrPtr + 0x3);
- luma_dbl const lval = luma_getDbl(laddr);
- luma_dbl const rval = luma_getDbl(raddr);
- luma_log("CPD @%" PRIX16 " %" PRIX16 "=%" PRIX16 " %" PRIX16 "=%" PRIX16 ": ",luma_dat.instrPtr,laddr,lval,raddr,rval);
- if (lval < rval) {
- luma_result = 0x0;
- }
- else if (lval > rval) {
- luma_result = 0x2;
- }
- else {
- luma_result = 0x1;
- }
- luma_log("%" PRIX8 "\n",luma_result);
- luma_dat.instrPtr += 0x4;
-}
-
-static void luma_opcdHandl_drw(void) {
- luma_log("DRW @%" PRIX16 "\n",luma_dat.instrPtr);
- luma_drwVram();
-}
-
-static void luma_opcdHandl_cpp(void) {
- luma_dbl const destPtr = luma_getDbl(luma_dat.instrPtr + 0x1);
- luma_dbl const dest = luma_getDbl(destPtr);
- luma_dbl const src = luma_getDbl(luma_dat.instrPtr + 0x3);
- luma_byte const srcVal = luma_mem[src];
- luma_log("CPP @%" PRIX16 " %" PRIX16 "=%" PRIX16 " %" PRIX16 "=%" PRIX8 "\n",luma_dat.instrPtr,destPtr,dest,src,srcVal);
- luma_setByte(dest,srcVal);
- luma_dat.instrPtr += 0x4;
-}
-
-static void luma_opcdHandl_stp(void) {
- luma_dbl const destPtr = luma_getDbl(luma_dat.instrPtr + 0x1);
- luma_dbl const dest = luma_getDbl(destPtr);
- luma_byte const val = luma_mem[luma_dat.instrPtr + 0x3];
- luma_log("STP @%" PRIX16 " %" PRIX16 "=%" PRIX16 " %" PRIX8 "\n",luma_dat.instrPtr,destPtr,dest,val);
- luma_setByte(dest,val);
- luma_dat.instrPtr += 0x4;
-}
diff --git a/luma/src/luma_setByte.c b/luma/src/luma_setByte.c
deleted file mode 100644
index f0b79d3..0000000
--- a/luma/src/luma_setByte.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Copyright 2021, 2022 Gabriel Jensen
-
- This file is part of luma.
-
- luma is free software: you can redistribute it and/or modify it under the
- terms of the GNU Affero General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- luma 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 Affero General Public License
- along with luma. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "luma.h"
-
-#include <inttypes.h>
-#include <stdio.h>
-
-void luma_setByte(luma_dbl const _addr,luma_byte const _val) {
- if ((_addr >= 0x8000 && _addr <= 0xE808) || (_addr >= 0xF000 && _addr <= 0xFFFF)) { /* Address must be inside VRAM, system RAM, cartridge RAM, any of the registers, or the sound buffer before we can write to it. */
- luma_mem[_addr] = _val;
- }
- else {
- fprintf(stderr,"! Attempted to write at read-only address at %" PRIX16 "\n",_addr);
- }
-}
diff --git a/luma/src/luma_setDbl.c b/luma/src/luma_setDbl.c
deleted file mode 100644
index 2a67e23..0000000
--- a/luma/src/luma_setDbl.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- Copyright 2021, 2022 Gabriel Jensen
-
- This file is part of luma.
-
- luma is free software: you can redistribute it and/or modify it under the
- terms of the GNU Affero General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- luma 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 Affero General Public License
- along with luma. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "luma.h"
-
-void luma_setDbl(luma_dbl const _addr,luma_dbl const _val) {
- luma_setByte(_addr,(luma_byte)_val);
- luma_setByte(_addr + 0x1,(luma_byte)(_val >> 0x8));
-}
diff --git a/luma/src/main.c b/luma/src/main.c
deleted file mode 100644
index 7427f07..0000000
--- a/luma/src/main.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- Copyright 2021, 2022 Gabriel Jensen
-
- This file is part of luma.
-
- luma is free software: you can redistribute it and/or modify it under the
- terms of the GNU Affero General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- luma 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 Affero General Public License
- along with luma. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "luma.h"
-
-#include <SDL2/SDL.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/random.h>
-
-int main(void) {
- printf("luma %i\n",luma_ver);
- printf("Copyright 2021, 2022 Gabriel Jensen\n\n");
- luma_initDat();
- memset(luma_mem,0x0,0x10000); /* We initialise all of the memory to zero so the behaviour is not UB. */
- if (luma_initWin()) {
- return EXIT_FAILURE;
- }
- luma_ldBootlder();
- luma_log("\nBootstrapping...\n");
- while (!luma_dat.dead) {
- if (luma_checkEvts()) {
- goto stop;
- }
- getrandom(&luma_rnd,sizeof (luma_byte),GRND_RANDOM);
- luma_proc();
- }
- while (!luma_checkEvts()) {}
-stop:;
-#if !defined(NDEBUG)
- luma_memDump();
-#endif
- SDL_DestroyWindow(luma_dat.win);
- SDL_Quit();
-}
diff --git a/src/luma.rs b/src/luma.rs
new file mode 100644
index 0000000..57c2768
--- /dev/null
+++ b/src/luma.rs
@@ -0,0 +1,30 @@
+// Copyright 2021-2023 Gabriel Jensen.
+
+pub mod app;
+
+pub const VER: u32 = 0x1E;
+
+pub const MEMSIZ: usize = 0x0E010000;
+
+pub const BTLSIZ: usize = 0x00004000;
+pub const IMGSIZ: usize = 0x06000000;
+
+pub struct Reg {
+ r0: u32,
+ r1: u32,
+ r2: u32,
+ r3: u32,
+ r4: u32,
+ r5: u32,
+ r6: u32,
+ r7: u32,
+ r8: u32,
+ r9: u32,
+ r10: u32,
+ r11: u32,
+ r12: u32,
+ sp: u32,
+ lr: u32,
+ pc: u32,
+ cpsr: u32,
+}
diff --git a/src/luma/app.rs b/src/luma/app.rs
new file mode 100644
index 0000000..d12dbfa
--- /dev/null
+++ b/src/luma/app.rs
@@ -0,0 +1,15 @@
+// Copyright 2021-2023 Gabriel Jensen.
+
+pub mod emu;
+pub mod end;
+pub mod ini;
+pub mod new;
+pub mod prspar;
+pub mod run;
+pub mod trp;
+
+pub struct App {
+ btl: String,
+ img: String,
+ mem: *mut u8,
+}
diff --git a/src/luma/app/emu.rs b/src/luma/app/emu.rs
new file mode 100644
index 0000000..3dad048
--- /dev/null
+++ b/src/luma/app/emu.rs
@@ -0,0 +1,64 @@
+// Copyright 2021-2023 Gabriel Jensen.
+
+use crate::luma::{MEMSIZ, Reg};
+use crate::luma::app::App;
+
+impl App {
+ pub fn emu(&mut self) {
+ eprintln!("starting emulation");
+
+ // Initialise registers:
+ let mut reg = Reg {
+ r0: 0x00000000,
+ r1: 0x00000000,
+ r2: 0x00000000,
+ r3: 0x00000000,
+ r4: 0x00000000,
+ r5: 0x00000000,
+ r6: 0x00000000,
+ r7: 0x00000000,
+ r8: 0x00000000,
+ r9: 0x00000000,
+ r10: 0x00000000,
+ r11: 0x00000000,
+ r12: 0x00000000,
+ sp: 0x00000000,
+ lr: 0x00000000,
+ pc: 0x08000008,
+ cpsr: 0b00000000000000000000000000001111,
+ };
+
+ //let mem = self.mem; // For convenience.
+
+ eprintln!("starting at 0x{:08X}",reg.pc - 0x8);
+
+ loop {
+ // Check the current address:
+ if reg.pc >= MEMSIZ as u32 {
+ self.end(0x1, Some(format!("out-of-bounds address {:X}",reg.pc).as_str()));
+ }
+
+ // Decode opcode:
+ let opc = unsafe { *(self.mem.add((reg.pc - 0x8) as usize) as *mut u32) };
+
+ // Currently, we only support the bal.w instruction.
+ if opc & 0b11111111000000000000000000000000 == 0b11101010000000000000000000000000 {
+ let off: u32 = opc & 0b00000000111111111111111111111111;
+ let abs: u32 = !(opc - 0x1) & 0b00000000111111111111111111111111;
+
+ reg.pc = match (off & 0b00000000100000000000000000000000) != 0x0 { // If negative...
+ false => reg.pc + off * 0x4 + 0x8,
+ true => reg.pc - abs * 0x4 + 0x8,
+ };
+ eprintln!("branch {off:X} => {:X}",reg.pc);
+
+ continue;
+ } else {
+ self.trp(&reg, opc);
+ }
+
+ // Continue:
+ reg.pc += 0x4;
+ }
+ }
+}
diff --git a/src/luma/app/end.rs b/src/luma/app/end.rs
new file mode 100644
index 0000000..db2c842
--- /dev/null
+++ b/src/luma/app/end.rs
@@ -0,0 +1,21 @@
+// Copyright 2021-2023 Gabriel Jensen.
+
+use crate::luma::MEMSIZ;
+use crate::luma::app::App;
+
+use std::alloc::{dealloc, Layout};
+use std::process::exit;
+
+impl App {
+ pub fn end(&mut self, cod: u8, msg: Option<&str>) {
+ if cod != 0x0 {
+ eprintln!("error: {}", msg.unwrap());
+ }
+
+ eprintln!("ending");
+
+ unsafe { dealloc(self.mem, Layout::new::<[u32; MEMSIZ/0x20usize]>()) };
+
+ exit(cod as i32);
+ }
+}
diff --git a/src/luma/app/ini.rs b/src/luma/app/ini.rs
new file mode 100644
index 0000000..f4ee5e7
--- /dev/null
+++ b/src/luma/app/ini.rs
@@ -0,0 +1,16 @@
+// Copyright 2021-2023 Gabriel Jensen.
+
+use crate::luma::MEMSIZ;
+use crate::luma::app::App;
+
+use std::alloc::{alloc_zeroed, Layout};
+
+impl App {
+ pub fn ini(&mut self) {
+ eprintln!("initialising");
+
+ self.mem = unsafe { alloc_zeroed(Layout::new::<[u32; MEMSIZ]>()) };
+
+ eprintln!("allocated memory buffer at 0x{:0X}", self.mem as usize);
+ }
+}
diff --git a/src/luma/app/new.rs b/src/luma/app/new.rs
new file mode 100644
index 0000000..1b30f3e
--- /dev/null
+++ b/src/luma/app/new.rs
@@ -0,0 +1,17 @@
+// Copyright 2021-2023 Gabriel Jensen.
+
+use crate::luma::app::App;
+
+use std::ptr::null;
+
+impl App {
+ pub fn new() -> App {
+ let app = App {
+ btl: "bootloader.bin".to_string(),
+ img: "image.agb".to_string(),
+ mem: null::<u8>() as *mut u8,
+ };
+
+ return app;
+ }
+}
diff --git a/src/luma/app/prspar.rs b/src/luma/app/prspar.rs
new file mode 100644
index 0000000..2353787
--- /dev/null
+++ b/src/luma/app/prspar.rs
@@ -0,0 +1,26 @@
+// Copyright 2021-2023 Gabriel Jensen.
+
+use crate::luma::app::App;
+
+use std::env::args;
+
+impl App {
+ pub fn prspar(&mut self) {
+ eprintln!("parsing parameters");
+
+ let arg: Vec<String> = args().collect();
+ let num = arg.len();
+
+ if num >= 0x2 {
+ self.img = arg[0x1].clone();
+ }
+
+ if num >= 0x3 {
+ self.btl = arg[0x2].clone();
+ }
+
+ if num > 0x3 {
+ self.end(0x1,Some(format!("invalid number of parameters ({num})").as_str()));
+ }
+ }
+}
diff --git a/src/luma/app/run.rs b/src/luma/app/run.rs
new file mode 100644
index 0000000..3abbc0a
--- /dev/null
+++ b/src/luma/app/run.rs
@@ -0,0 +1,44 @@
+// Copyright 2021-2023 Gabriel Jensen.
+
+use crate::luma::{BTLSIZ, IMGSIZ, VER};
+use crate::luma::app::App;
+
+use std::fs::File;
+use std::io::Read;
+use std::slice;
+
+impl App {
+ pub fn run(&mut self) {
+ eprintln!("luma {VER}");
+
+ self.prspar();
+
+ self.ini();
+
+ {
+ eprintln!("loading booatloader \"{}\"",self.btl);
+
+ // Open bootloader:
+ let mut btl = File::open(self.btl.clone()).expect("unable to open bootloader");
+
+ // Read bootloader:
+ let slc = unsafe { slice::from_raw_parts_mut(self.mem.offset(0x00000000), BTLSIZ) };
+ btl.read(slc).expect("unable to read bootloader");
+ }
+
+ {
+ eprintln!("loading image \"{}\"",self.img);
+
+ // Open image:
+ let mut img = File::open(self.img.clone()).expect("unable to open image");
+
+ // Read image:
+ let slc = unsafe { slice::from_raw_parts_mut(self.mem.offset(0x08000000), IMGSIZ) };
+ img.read(slc).expect("unable to read image");
+ }
+
+ self.emu();
+
+ self.end(0x0,None);
+ }
+}
diff --git a/src/luma/app/trp.rs b/src/luma/app/trp.rs
new file mode 100644
index 0000000..7ec4cec
--- /dev/null
+++ b/src/luma/app/trp.rs
@@ -0,0 +1,29 @@
+// Copyright 2021-2023 Gabriel Jensen.
+
+use crate::luma::Reg;
+use crate::luma::app::App;
+
+impl App {
+ pub fn trp(&mut self, reg: &Reg, opc: u32) {
+ eprintln!("trap - register dump:");
+ eprintln!("\tr0: {:08X}", reg.r0);
+ eprintln!("\tr1: {:08X}", reg.r1);
+ eprintln!("\tr2: {:08X}", reg.r2);
+ eprintln!("\tr3: {:08X}", reg.r3);
+ eprintln!("\tr4: {:08X}", reg.r4);
+ eprintln!("\tr5: {:08X}", reg.r5);
+ eprintln!("\tr6: {:08X}", reg.r6);
+ eprintln!("\tr7: {:08X}", reg.r7);
+ eprintln!("\tr8: {:08X}", reg.r8);
+ eprintln!("\tr9: {:08X}", reg.r9);
+ eprintln!("\tr10: {:08X}", reg.r10);
+ eprintln!("\tr11: {:08X}", reg.r11);
+ eprintln!("\tr12: {:08X}", reg.r12);
+ eprintln!("\tsp: {:08X}", reg.sp);
+ eprintln!("\tlr: {:08X}", reg.lr);
+ eprintln!("\tpc: {:08X}", reg.pc);
+ eprintln!("\tcpsr: {:032b}", reg.cpsr);
+
+ self.end(0x1, Some(format!("invalid opcode 0x{opc:08X} at 0x{:08X}",reg.pc-0x8).as_str()));
+ }
+}
diff --git a/src/main.rs b/src/main.rs
new file mode 100644
index 0000000..aaa0e2b
--- /dev/null
+++ b/src/main.rs
@@ -0,0 +1,10 @@
+// Copyright 2021-2023 Gabriel Jensen.
+
+mod luma;
+
+use crate::luma::app::App;
+
+fn main() {
+ let mut app = App::new();
+ app.run();
+}