diff --git a/.cargo/config.toml b/.cargo/config.toml
new file mode 100644
index 0000000..6a5ba74
--- /dev/null
+++ b/.cargo/config.toml
@@ -0,0 +1,2 @@
+[build]
+target = "riscv64gc-unknown-none-elf"
\ No newline at end of file
diff --git a/os/.gitignore b/.gitignore
similarity index 100%
rename from os/.gitignore
rename to .gitignore
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 0000000..5159e80
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "os"
+version = "0.1.0"
diff --git a/user/Cargo.toml b/Cargo.toml
similarity index 63%
rename from user/Cargo.toml
rename to Cargo.toml
index 534e542..aad338f 100644
--- a/user/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,6 @@
[package]
-name = "user_lib"
+name = "os"
version = "0.1.0"
edition = "2021"
[dependencies]
-riscv = "0.12.1"
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index f288702..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
- 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
deleted file mode 100644
index 8592b91..0000000
--- a/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# rCore Exercises
-
-## Build
-
-### in dir `user`
-
-``` bash
-cargo build --release
-rust-objcopy --strip-all target/riscv64gc-unknown-none-elf/release/00_hello_world -O binary target/riscv64gc-unknown-none-elf/release/00_hello_world.bin
-...
-```
-
-### in dir `os`
-
-``` bash
-LOG=TRACE cargo build --release
-```
-
-## Run
-
-rustsbi-qemu should be downloaded manually.
-
-``` bash
-qemu-system-riscv64 -machine virt -nographic -bios target/riscv64gc-unknown-none-elf/release/rustsbi-qemu.bin -device loader,file=target/riscv64gc-unknown-none-elf/release/os
-```
\ No newline at end of file
diff --git a/os/.cargo/config.toml b/os/.cargo/config.toml
deleted file mode 100644
index 6ddcd53..0000000
--- a/os/.cargo/config.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[build]
-target = "riscv64gc-unknown-none-elf"
-
-[target.riscv64gc-unknown-none-elf]
-rustflags = [
- "-Clink-arg=-Tsrc/linker.ld", "-Cforce-frame-pointers=yes"
-]
\ No newline at end of file
diff --git a/os/Cargo.lock b/os/Cargo.lock
deleted file mode 100644
index ba98085..0000000
--- a/os/Cargo.lock
+++ /dev/null
@@ -1,132 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "critical-section"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
-
-[[package]]
-name = "embedded-hal"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89"
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-dependencies = [
- "spin",
-]
-
-[[package]]
-name = "log"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-
-[[package]]
-name = "os"
-version = "0.1.0"
-dependencies = [
- "lazy_static",
- "log",
- "riscv",
- "sbi-rt",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "riscv"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea8ff73d3720bdd0a97925f0bf79ad2744b6da8ff36be3840c48ac81191d7a7"
-dependencies = [
- "critical-section",
- "embedded-hal",
- "paste",
- "riscv-macros",
- "riscv-pac",
-]
-
-[[package]]
-name = "riscv-macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f265be5d634272320a7de94cea15c22a3bfdd4eb42eb43edc528415f066a1f25"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "riscv-pac"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8188909339ccc0c68cfb5a04648313f09621e8b87dc03095454f1a11f6c5d436"
-
-[[package]]
-name = "sbi-rt"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fbaa69be1eedc61c426e6d489b2260482e928b465360576900d52d496a58bd0"
-dependencies = [
- "sbi-spec",
-]
-
-[[package]]
-name = "sbi-spec"
-version = "0.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6e36312fb5ddc10d08ecdc65187402baba4ac34585cb9d1b78522ae2358d890"
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
-[[package]]
-name = "syn"
-version = "2.0.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
diff --git a/os/Cargo.toml b/os/Cargo.toml
deleted file mode 100644
index d7dfdfb..0000000
--- a/os/Cargo.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[package]
-name = "os"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-lazy_static = { version = "1.5.0", features = ["spin_no_std"] }
-log = "0.4.22"
-riscv = "0.12.1"
-sbi-rt = "0.0.3"
diff --git a/os/src/batch.rs b/os/src/batch.rs
deleted file mode 100644
index cf243f3..0000000
--- a/os/src/batch.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-use core::{arch::asm, mem, slice};
-
-use lazy_static::*;
-use log::info;
-
-use crate::{sbi::shutdown, sync::UPSafeCell, trap::TrapContext};
-
-const KERNEL_STACK_SIZE: usize = 4096 * 2;
-const USER_STACK_SIZE: usize = 4096 * 2;
-const MAX_APP_NUM: usize = 16;
-const APP_BASE_ADDRESS: usize = 0x80400000;
-const APP_SIZE_LIMIT: usize = 0x20000;
-
-#[repr(align(4096))]
-struct KernelStack {
- data: [u8; KERNEL_STACK_SIZE],
-}
-#[repr(align(4096))]
-struct UserStack {
- data: [u8; USER_STACK_SIZE],
-}
-
-static KERNEL_STACK: KernelStack = KernelStack {
- data: [0; KERNEL_STACK_SIZE],
-};
-static USER_STACK: UserStack = UserStack {
- data: [0; USER_STACK_SIZE],
-};
-
-impl KernelStack {
- fn get_sp(&self) -> usize {
- self.data.as_ptr() as usize + KERNEL_STACK_SIZE
- }
-
- pub fn push_context(&self, cx: TrapContext) -> &'static mut TrapContext {
- let cx_ptr = (self.get_sp() - mem::size_of::()) as *mut TrapContext;
- unsafe {
- *cx_ptr = cx;
- }
- unsafe { cx_ptr.as_mut().unwrap() }
- }
-}
-
-impl UserStack {
- fn get_sp(&self) -> usize {
- self.data.as_ptr() as usize + USER_STACK_SIZE
- }
-}
-
-struct AppManager {
- num_app: usize,
- current_app: usize,
- app_start: [usize; MAX_APP_NUM + 1],
-}
-
-impl AppManager {
- pub fn print_app_info(&self) {
- info!(target: "kernel", "num_app = {}", self.num_app);
- for i in 0..self.num_app {
- info!(target: "kernel", "app_{} [{:#x}, {:#x}]", i, self.app_start[i], self.app_start[i + 1]);
- }
- }
-
- pub fn get_current_app(&self) -> usize {
- self.current_app
- }
-
- pub fn move_to_next_app(&mut self) {
- self.current_app += 1;
- }
-
- unsafe fn load_app(&self, app_id: usize) {
- if app_id >= self.num_app {
- info!(target: "kernel", "All applications completed");
- shutdown(false);
- }
- info!(target: "kernel", "Loading app_{}", app_id);
-
- slice::from_raw_parts_mut(APP_BASE_ADDRESS as *mut u8, APP_SIZE_LIMIT).fill(0);
- let app_src = slice::from_raw_parts(self.app_start[app_id] as *const u8, self.app_start[app_id + 1] - self.app_start[app_id]);
- let app_dst = slice::from_raw_parts_mut(APP_BASE_ADDRESS as *mut u8, app_src.len());
- app_dst.copy_from_slice(app_src);
- asm!("fence.i");
- }
-}
-
-lazy_static! {
- static ref APP_MANAGER: UPSafeCell = unsafe {
- UPSafeCell::new({
- extern "C" {
- fn _num_app();
- }
-
- let num_app_ptr = _num_app as usize as *const usize;
- let num_app = num_app_ptr.read_volatile();
- let mut app_start: [usize; MAX_APP_NUM + 1] = [0; MAX_APP_NUM + 1];
- let app_start_raw: &[usize] = slice::from_raw_parts(num_app_ptr.add(1), num_app + 1);
- app_start[..=num_app].copy_from_slice(app_start_raw);
- AppManager {
- num_app,
- current_app: 0,
- app_start,
- }
- })
- };
-}
-
-pub fn init() {
- print_app_info();
-}
-
-pub fn print_app_info() {
- APP_MANAGER.exclusive_access().print_app_info();
-}
-
-pub fn run_next_app() -> ! {
- let mut app_manager = APP_MANAGER.exclusive_access();
- let current_app = app_manager.get_current_app();
- unsafe {
- app_manager.load_app(current_app);
- }
- app_manager.move_to_next_app();
- drop(app_manager);
-
- extern "C" {
- fn __restore(cx_addr: usize);
- }
- unsafe {
- __restore(KERNEL_STACK.push_context(TrapContext::app_init_context(
- APP_BASE_ADDRESS,
- USER_STACK.get_sp(),
- )) as *const _ as usize);
- }
- panic!("Unreachable in batch::run_current_app");
-}
\ No newline at end of file
diff --git a/os/src/console.rs b/os/src/console.rs
deleted file mode 100644
index 00aa650..0000000
--- a/os/src/console.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use core::fmt::{self, Write};
-use crate::sbi;
-
-struct Stdout;
-
-impl Write for Stdout {
- fn write_str(&mut self, s: &str) -> core::fmt::Result {
- sbi::console_write(s.as_bytes());
- Ok(())
- }
-}
-
-pub fn print(args: fmt::Arguments) {
- Stdout.write_fmt(args).unwrap();
-}
-
-#[macro_export]
-macro_rules! print {
- ($fmt: literal $(, $($arg: tt)+)?) => {
- $crate::console::print(format_args!($fmt $(, $($arg)+)?));
- };
-}
-
-#[macro_export]
-macro_rules! println {
- ($fmt: literal $(, $($arg: tt)+)?) => {
- $crate::console::print(format_args!(concat!($fmt, "\n") $(, $($arg)+)?));
- };
-}
\ No newline at end of file
diff --git a/os/src/entry.asm b/os/src/entry.asm
deleted file mode 100644
index bf1f801..0000000
--- a/os/src/entry.asm
+++ /dev/null
@@ -1,12 +0,0 @@
- .section .text.entry
- .globl _start
-_start:
- la sp, boot_start_top
- call rust_main
-
- .section .bss.stack
- .globl boot_stack_lower_bound
-boot_stack_lower_bound:
- .space 4096 * 16
- .globl boot_start_top
-boot_start_top:
\ No newline at end of file
diff --git a/os/src/lang_items.rs b/os/src/lang_items.rs
deleted file mode 100644
index 482328e..0000000
--- a/os/src/lang_items.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use core::panic::PanicInfo;
-use crate::{sbi, println};
-
-#[panic_handler]
-fn panic(info: &PanicInfo) -> ! {
- let err = info.message().as_str().unwrap();
- if let Some(location) = info.location() {
- println!(
- "Panicked at {}:{} {}",
- location.file(),
- location.line(),
- err
- );
- } else {
- println!("Panicked: {}", err);
- }
- sbi::shutdown(true)
-}
\ No newline at end of file
diff --git a/os/src/link_app.S b/os/src/link_app.S
deleted file mode 100644
index c55d8e3..0000000
--- a/os/src/link_app.S
+++ /dev/null
@@ -1,47 +0,0 @@
-
- .align 3
- .section .data
- .global _num_app
-_num_app:
- .quad 5
- .quad app_0_start
- .quad app_1_start
- .quad app_2_start
- .quad app_3_start
- .quad app_4_start
- .quad app_4_end
-
- .section .data
- .global app_0_start
- .global app_0_end
-app_0_start:
- .incbin "../user/target/riscv64gc-unknown-none-elf/release/00_hello_world.bin"
-app_0_end:
-
- .section .data
- .global app_1_start
- .global app_1_end
-app_1_start:
- .incbin "../user/target/riscv64gc-unknown-none-elf/release/01_store_fault.bin"
-app_1_end:
-
- .section .data
- .global app_2_start
- .global app_2_end
-app_2_start:
- .incbin "../user/target/riscv64gc-unknown-none-elf/release/02_power.bin"
-app_2_end:
-
- .section .data
- .global app_3_start
- .global app_3_end
-app_3_start:
- .incbin "../user/target/riscv64gc-unknown-none-elf/release/03_priv_inst.bin"
-app_3_end:
-
- .section .data
- .global app_4_start
- .global app_4_end
-app_4_start:
- .incbin "../user/target/riscv64gc-unknown-none-elf/release/04_priv_csr.bin"
-app_4_end:
diff --git a/os/src/linker.ld b/os/src/linker.ld
deleted file mode 100644
index 02d26c6..0000000
--- a/os/src/linker.ld
+++ /dev/null
@@ -1,48 +0,0 @@
-OUTPUT_ARCH(riscv)
-ENTRY(_start)
-BASE_ADDRESS = 0x80200000;
-
-SECTIONS
-{
- . = BASE_ADDRESS;
- skernel = .;
-
- stext = .;
- .text : {
- *(.text.entry)
- *(.text .text.*)
- }
-
- . = ALIGN(4K);
- etext = .;
- srodata = .;
- .rodata : {
- *(.data .rodata.*)
- *(.srodata .srodata.*)
- }
-
- . = ALIGN(4K);
- erodata = .;
- sdata = .;
- .data : {
- *(.data .data.*)
- *(.sdata .sdata.*)
- }
-
- . = ALIGN(4K);
- edata = .;
- .bss : {
- *(.bss.stack)
- sbss = .;
- *(.bss .bss.*)
- *(.sbss .sbss.*)
- }
-
- . = ALIGN(4K);
- ebss = .;
- ekernel = .;
-
- /DISCARD/ : {
- *(.eh_frame)
- }
-}
\ No newline at end of file
diff --git a/os/src/logger.rs b/os/src/logger.rs
deleted file mode 100644
index 5b720e7..0000000
--- a/os/src/logger.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use log::{Level, LevelFilter, Log};
-
-use crate::println;
-
-struct Logger;
-
-impl Log for Logger {
- fn enabled(&self, _metadata: &log::Metadata) -> bool {
- true
- }
-
- fn log(&self, record: &log::Record) {
- if !self.enabled(record.metadata()) {
- return;
- }
-
- let (color, level) = match record.level() {
- Level::Error => (31, "ERR"),
- Level::Warn => (93, "WRN"),
- Level::Info => (34, "INF"),
- Level::Debug => (32, "DBG"),
- Level::Trace => (90, "TRC"),
- };
-
- println!("\x1b[{}m{}\x1b[0m \x1b[1m{}\x1b[0m {}", color, level, record.target(), record.args());
- }
-
- fn flush(&self) {}
-}
-
-pub fn init() {
- static LOGGER: Logger = Logger;
- log::set_logger(&LOGGER).unwrap();
- log::set_max_level(match option_env!("LOG") {
- Some("ERROR") => LevelFilter::Error,
- Some("WARN") => LevelFilter::Warn,
- Some("INFO") => LevelFilter::Info,
- Some("DEBUG") => LevelFilter::Debug,
- Some("TRACE") => LevelFilter::Trace,
- _ => LevelFilter::Off,
- });
-}
\ No newline at end of file
diff --git a/os/src/main.rs b/os/src/main.rs
deleted file mode 100644
index 0268870..0000000
--- a/os/src/main.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-#![no_std]
-#![no_main]
-
-mod lang_items;
-mod sbi;
-mod logger;
-
-#[macro_use]
-mod console;
-
-mod batch;
-mod sync;
-mod trap;
-mod syscall;
-
-use core::arch::global_asm;
-use log::{debug, error, info, trace, warn};
-
-global_asm!(include_str!("entry.asm"));
-global_asm!(include_str!("link_app.S"));
-
-#[no_mangle]
-pub fn rust_main() -> ! {
- clear_bss();
- logger::init();
-
- print_system_info();
- print_to_console();
-
- trap::init();
- batch::init();
- batch::run_next_app();
-}
-
-fn clear_bss() {
- extern "C" {
- fn sbss();
- fn ebss();
- }
- (sbss as usize..ebss as usize).for_each(|a| {
- unsafe { (a as *mut u8).write_volatile(0) }
- });
-}
-
-fn print_to_console() {
- sbi::console_write_byte('O' as u8);
- sbi::console_write_byte('K' as u8);
- sbi::console_write_byte('\n' as u8);
-
- trace!("Hello World.");
- debug!("Hello World.");
- info!("Hello World.");
- warn!("Hello World.");
- error!("Hello World.");
-}
-
-fn print_system_info() {
- extern "C" {
- fn stext();
- fn etext();
- fn sdata();
- fn edata();
- fn srodata();
- fn erodata();
- fn sbss();
- fn ebss();
- }
-
- info!(".text [{:#x}, {:#x}]", stext as usize, etext as usize);
- info!(".rodata [{:#x}, {:#x}]", srodata as usize, erodata as usize);
- info!(".data [{:#x}, {:#x}]", sdata as usize, edata as usize);
- info!(".bss [{:#x}, {:#x}]", sbss as usize, ebss as usize);
-}
\ No newline at end of file
diff --git a/os/src/sbi.rs b/os/src/sbi.rs
deleted file mode 100644
index ad5f72f..0000000
--- a/os/src/sbi.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-pub fn console_write_byte(c: u8) {
- sbi_rt::console_write_byte(c);
-}
-
-pub fn console_write(bytes: &[u8]) {
- let range = bytes.as_ptr_range();
- let bytes = sbi_rt::Physical::new(bytes.len(), range.start as usize, range.end as usize);
- sbi_rt::console_write(bytes);
-}
-
-pub fn shutdown(failure: bool) -> ! {
- use sbi_rt::{system_reset, NoReason, Shutdown, SystemFailure};
- if !failure {
- system_reset(Shutdown, NoReason);
- } else {
- system_reset(Shutdown, SystemFailure);
- }
- unreachable!()
-}
\ No newline at end of file
diff --git a/os/src/sync/mod.rs b/os/src/sync/mod.rs
deleted file mode 100644
index 7729524..0000000
--- a/os/src/sync/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod up;
-
-pub use up::UPSafeCell;
\ No newline at end of file
diff --git a/os/src/sync/up.rs b/os/src/sync/up.rs
deleted file mode 100644
index 8ace25a..0000000
--- a/os/src/sync/up.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use core::cell::{RefCell, RefMut};
-
-pub struct UPSafeCell {
- inner: RefCell
-}
-
-unsafe impl Sync for UPSafeCell {}
-
-impl UPSafeCell {
- pub unsafe fn new(value: T) -> Self {
- Self {
- inner: RefCell::new(value)
- }
- }
- pub fn exclusive_access(&self) -> RefMut<'_, T> {
- self.inner.borrow_mut()
- }
-}
\ No newline at end of file
diff --git a/os/src/syscall/fs.rs b/os/src/syscall/fs.rs
deleted file mode 100644
index 453febd..0000000
--- a/os/src/syscall/fs.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use core::{slice, str};
-
-const FD_STDOUT: usize = 1;
-
-pub fn sys_write(fd: usize, buf: *const u8, len: usize) -> isize {
- match fd {
- FD_STDOUT => {
- let slice = unsafe { slice::from_raw_parts(buf, len) };
- let str = str::from_utf8(slice).unwrap();
- print!("{}", str);
- len as isize
- }
- _ => {
- panic!("Unsupported fd in sys_write!");
- }
- }
-}
\ No newline at end of file
diff --git a/os/src/syscall/mod.rs b/os/src/syscall/mod.rs
deleted file mode 100644
index 5be165c..0000000
--- a/os/src/syscall/mod.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use fs::sys_write;
-use process::sys_exit;
-
-const SYSCALL_WRITE: usize = 64;
-const SYSCALL_EXIT: usize = 93;
-
-mod fs;
-mod process;
-
-pub fn syscall(syscall_id: usize, args: [usize; 3]) -> isize {
- match syscall_id {
- SYSCALL_WRITE => sys_write(args[0], args[1] as *const u8, args[2]),
- SYSCALL_EXIT => sys_exit(args[0] as i32),
- _ => panic!("Unsupported syscall_id: {}", syscall_id)
- }
-}
\ No newline at end of file
diff --git a/os/src/syscall/process.rs b/os/src/syscall/process.rs
deleted file mode 100644
index b93fa4d..0000000
--- a/os/src/syscall/process.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-use log::info;
-
-use crate::batch::run_next_app;
-
-pub fn sys_exit(exit_code: i32) -> ! {
- info!(target: "kernel", "Application exited with code {}", exit_code);
- run_next_app()
-}
\ No newline at end of file
diff --git a/os/src/trap/context.rs b/os/src/trap/context.rs
deleted file mode 100644
index 6abbfd6..0000000
--- a/os/src/trap/context.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use riscv::register::sstatus::{self, Sstatus, SPP};
-
-#[repr(C)]
-pub struct TrapContext {
- pub x: [usize; 32],
- pub sstatus: Sstatus,
- pub sepc: usize,
-}
-
-impl TrapContext {
- pub fn set_sp(&mut self, sp: usize) {
- self.x[2] = sp;
- }
-
- pub fn app_init_context(entry: usize, sp: usize) -> Self {
- let cur_sstatus = sstatus::read();
- unsafe {
- sstatus::set_spp(SPP::User);
- }
- let mut cx = Self {
- x: [0; 32],
- sstatus: cur_sstatus,
- sepc: entry,
- };
- cx.set_sp(sp);
- cx
- }
-}
\ No newline at end of file
diff --git a/os/src/trap/mod.rs b/os/src/trap/mod.rs
deleted file mode 100644
index 06b25b4..0000000
--- a/os/src/trap/mod.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-mod context;
-pub use context::TrapContext;
-use log::error;
-
-use core::arch::global_asm;
-
-use riscv::{interrupt::{Exception, Trap}, register::{scause, stval, stvec::{self, TrapMode}}};
-
-use crate::{batch::run_next_app, syscall};
-
-global_asm!(include_str!("trap.S"));
-
-pub fn init() {
- extern "C" {
- fn __alltraps();
- }
- unsafe {
- stvec::write(__alltraps as usize, TrapMode::Direct);
- }
-}
-
-#[no_mangle]
-pub fn trap_handler(cx: &mut TrapContext) -> &mut TrapContext {
- let scause = scause::read();
- let stval = stval::read();
- match scause.cause() {
- Trap::Exception(e) if e == Exception::UserEnvCall as usize => {
- cx.sepc += 4;
- cx.x[10] = syscall::syscall(cx.x[17], [cx.x[10], cx.x[11], cx.x[12]]) as usize;
- }
- Trap::Exception(e) if e == Exception::StoreFault as usize || e == Exception::StorePageFault as usize => {
- error!(target: "kernel", "PageFault in application, kernel killed it.");
- run_next_app();
- }
- Trap::Exception(e) if e == Exception::IllegalInstruction as usize => {
- error!(target: "kernel", "IllegalInstruction in application, kernel killed it.");
- run_next_app();
- }
- _ => {
- panic!("un supported strp {:?}, stval = {:#x}!", scause.cause(), stval);
- }
- }
- cx
-}
\ No newline at end of file
diff --git a/os/src/trap/trap.S b/os/src/trap/trap.S
deleted file mode 100644
index 9d6967c..0000000
--- a/os/src/trap/trap.S
+++ /dev/null
@@ -1,64 +0,0 @@
-.altmacro
-.macro SAVE_GP n
- sd x\n, \n*8(sp)
-.endm
-.macro LOAD_GP n
- ld x\n, \n*8(sp)
-.endm
- .section .text
- .globl __alltraps
- .globl __restore
- .align 2
-__alltraps:
- csrrw sp, sscratch, sp
- # now sp->kernel stack, sscratch->user stack
- # allocate a TrapContext on kernel stack
- addi sp, sp, -34*8
- # save general-purpose registers
- sd x1, 1*8(sp)
- # skip sp(x2), we will save it later
- sd x3, 3*8(sp)
- # skip tp(x4), application does not use it
- # save x5~x31
- .set n, 5
- .rept 27
- SAVE_GP %n
- .set n, n+1
- .endr
- # we can use t0/t1/t2 freely, because they were saved on kernel stack
- csrr t0, sstatus
- csrr t1, sepc
- sd t0, 32*8(sp)
- sd t1, 33*8(sp)
- # read user stack from sscratch and save it on the kernel stack
- csrr t2, sscratch
- sd t2, 2*8(sp)
- # set input argument of trap_handler(cx: &mut TrapContext)
- mv a0, sp
- call trap_handler
-
-__restore:
- # case1: start running app by __restore
- # case2: back to U after handling trap
- mv sp, a0
- # now sp->kernel stack(after allocated), sscratch->user stack
- # restore sstatus/sepc
- ld t0, 32*8(sp)
- ld t1, 33*8(sp)
- ld t2, 2*8(sp)
- csrw sstatus, t0
- csrw sepc, t1
- csrw sscratch, t2
- # restore general-purpuse registers except sp/tp
- ld x1, 1*8(sp)
- ld x3, 3*8(sp)
- .set n, 5
- .rept 27
- LOAD_GP %n
- .set n, n+1
- .endr
- # release TrapContext on kernel stack
- addi sp, sp, 34*8
- # now sp->kernel stack, sscratch->user stack
- csrrw sp, sscratch, sp
- sret
diff --git a/src/lang_items.rs b/src/lang_items.rs
new file mode 100644
index 0000000..a5f300c
--- /dev/null
+++ b/src/lang_items.rs
@@ -0,0 +1,6 @@
+use core::panic::PanicInfo;
+
+#[panic_handler]
+fn panic(_info: &PanicInfo) -> ! {
+ loop {}
+}
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
new file mode 100644
index 0000000..f156fda
--- /dev/null
+++ b/src/main.rs
@@ -0,0 +1,4 @@
+#![no_std]
+#![no_main]
+
+mod lang_items;
diff --git a/user/.cargo/config.toml b/user/.cargo/config.toml
deleted file mode 100644
index 6ddcd53..0000000
--- a/user/.cargo/config.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[build]
-target = "riscv64gc-unknown-none-elf"
-
-[target.riscv64gc-unknown-none-elf]
-rustflags = [
- "-Clink-arg=-Tsrc/linker.ld", "-Cforce-frame-pointers=yes"
-]
\ No newline at end of file
diff --git a/user/.gitignore b/user/.gitignore
deleted file mode 100644
index ea8c4bf..0000000
--- a/user/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/user/Cargo.lock b/user/Cargo.lock
deleted file mode 100644
index 287fb7a..0000000
--- a/user/Cargo.lock
+++ /dev/null
@@ -1,93 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "critical-section"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
-
-[[package]]
-name = "embedded-hal"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89"
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "riscv"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea8ff73d3720bdd0a97925f0bf79ad2744b6da8ff36be3840c48ac81191d7a7"
-dependencies = [
- "critical-section",
- "embedded-hal",
- "paste",
- "riscv-macros",
- "riscv-pac",
-]
-
-[[package]]
-name = "riscv-macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f265be5d634272320a7de94cea15c22a3bfdd4eb42eb43edc528415f066a1f25"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "riscv-pac"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8188909339ccc0c68cfb5a04648313f09621e8b87dc03095454f1a11f6c5d436"
-
-[[package]]
-name = "syn"
-version = "2.0.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
-
-[[package]]
-name = "user_lib"
-version = "0.1.0"
-dependencies = [
- "riscv",
-]
diff --git a/user/src/bin/00_hello_world.rs b/user/src/bin/00_hello_world.rs
deleted file mode 100644
index 684396a..0000000
--- a/user/src/bin/00_hello_world.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#![no_std]
-#![no_main]
-
-#[macro_use]
-extern crate user_lib;
-
-#[no_mangle]
-fn main() -> i32 {
- println!("Hello, world!");
- 0
-}
\ No newline at end of file
diff --git a/user/src/bin/01_store_fault.rs b/user/src/bin/01_store_fault.rs
deleted file mode 100644
index 855f285..0000000
--- a/user/src/bin/01_store_fault.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-#![no_std]
-#![no_main]
-
-#[macro_use]
-extern crate user_lib;
-
-#[no_mangle]
-fn main() -> i32 {
- println!("Into Test store_fault, we will insert an invalid store operation...");
- println!("kerne; should kill this application");
- unsafe {
- core::ptr::null_mut::().write_volatile(0);
- }
- 0
-}
\ No newline at end of file
diff --git a/user/src/bin/02_power.rs b/user/src/bin/02_power.rs
deleted file mode 100644
index 54fde24..0000000
--- a/user/src/bin/02_power.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-#![no_std]
-#![no_main]
-
-#[macro_use]
-extern crate user_lib;
-
-const SIZE: usize = 10;
-const P: u32 = 3;
-const STEP: usize = 100000;
-const MOD: u32 = 10007;
-
-#[no_mangle]
-fn main() -> i32 {
- let mut pow = [0u32; SIZE];
- let mut index: usize = 0;
- pow[index] = 1;
- for i in 1..=STEP {
- let last = pow[index];
- index = (index + 1) % SIZE;
- pow[index] = last * P % MOD;
- if i % 10000 == 0 {
- println!("{}^{}={}(MOD {})", P, i, pow[index], MOD);
- }
- }
- println!("Test power OK!");
- 0
-}
\ No newline at end of file
diff --git a/user/src/bin/03_priv_inst.rs b/user/src/bin/03_priv_inst.rs
deleted file mode 100644
index 04dac37..0000000
--- a/user/src/bin/03_priv_inst.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-#![no_std]
-#![no_main]
-
-#[macro_use]
-extern crate user_lib;
-
-use core::arch::asm;
-
-#[no_mangle]
-fn main() -> i32 {
- println!("Try to execute privileged instruction in U Mode");
- println!("Kernel should kill this application!");
- unsafe {
- asm!("sret");
- }
- 0
-}
diff --git a/user/src/bin/04_priv_csr.rs b/user/src/bin/04_priv_csr.rs
deleted file mode 100644
index fbd678f..0000000
--- a/user/src/bin/04_priv_csr.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-#![no_std]
-#![no_main]
-
-#[macro_use]
-extern crate user_lib;
-
-use riscv::register::sstatus::{self, SPP};
-
-#[no_mangle]
-fn main() -> i32 {
- println!("Try to access privileged CSR in U Mode");
- println!("Kernel should kill this application!");
- unsafe {
- sstatus::set_spp(SPP::User);
- }
- 0
-}
diff --git a/user/src/console.rs b/user/src/console.rs
deleted file mode 100644
index 93e7255..0000000
--- a/user/src/console.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use super::write;
-use core::fmt::{self, Write};
-
-
-struct Stdout;
-
-const STDOUT: usize = 1;
-
-impl Write for Stdout {
- fn write_str(&mut self, s: &str) -> fmt::Result {
- write(STDOUT, s.as_bytes());
- Ok(())
- }
-}
-
-pub fn print(args: fmt::Arguments) {
- Stdout.write_fmt(args).unwrap();
-}
-
-#[macro_export]
-macro_rules! print {
- ($fmt: literal $(, $($arg: tt)+)?) => {
- $crate::console::print(format_args!($fmt $(, $($arg)+)?));
- }
-}
-
-#[macro_export]
-macro_rules! println {
- ($fmt: literal $(, $($arg: tt)+)?) => {
- $crate::console::print(format_args!(concat!($fmt, "\n") $(, $($arg)+)?));
- }
-}
\ No newline at end of file
diff --git a/user/src/lang_items.rs b/user/src/lang_items.rs
deleted file mode 100644
index afa93e2..0000000
--- a/user/src/lang_items.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use core::panic::PanicInfo;
-
-#[panic_handler]
-fn panic(info: &PanicInfo) -> ! {
- let err = info.message().as_str().unwrap();
- if let Some(location) = info.location() {
- println!(
- "Panicked at {}:{}, {}",
- location.file(),
- location.line(),
- err
- );
- } else {
- println!("Panicked: {}", err);
- }
- loop {}
-}
\ No newline at end of file
diff --git a/user/src/lib.rs b/user/src/lib.rs
deleted file mode 100644
index 63bf15a..0000000
--- a/user/src/lib.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-#![no_std]
-
-#[macro_use]
-pub mod console;
-mod syscall;
-mod lang_items;
-
-#[no_mangle]
-#[link_section = ".text.entry"]
-pub extern "C" fn _start() -> ! {
- // linkage is not stable
- // but main function in user function required
- extern "C" {
- fn main() -> i32;
- }
- clear_bss();
- unsafe {
- exit(main());
- }
- panic!("unreachable after sys_exit")
-}
-
-fn clear_bss() {
- extern "C" {
- fn sbss();
- fn ebss();
- }
- (sbss as usize..ebss as usize).for_each(|addr| unsafe {
- (addr as *mut u8).write_volatile(0);
- });
-}
-
-pub fn write(fd: usize, buf: &[u8]) -> isize {
- syscall::sys_write(fd, buf)
-}
-pub fn exit(exit_code: i32) -> isize {
- syscall::sys_exit(exit_code)
-}
\ No newline at end of file
diff --git a/user/src/linker.ld b/user/src/linker.ld
deleted file mode 100644
index 01d13f2..0000000
--- a/user/src/linker.ld
+++ /dev/null
@@ -1,46 +0,0 @@
-OUTPUT_ARCH(riscv)
-ENTRY(_start)
-BASE_ADDRESS = 0x80400000;
-
-SECTIONS
-{
- . = BASE_ADDRESS;
-
- stext = .;
- .text : {
- *(.text.entry)
- *(.text .text.*)
- }
-
- . = ALIGN(4K);
- etext = .;
- srodata = .;
- .rodata : {
- *(.data .rodata.*)
- *(.srodata .srodata.*)
- }
-
- . = ALIGN(4K);
- erodata = .;
- sdata = .;
- .data : {
- *(.data .data.*)
- *(.sdata .sdata.*)
- }
-
- . = ALIGN(4K);
- edata = .;
- .bss : {
- *(.bss.stack)
- sbss = .;
- *(.bss .bss.*)
- *(.sbss .sbss.*)
- }
-
- . = ALIGN(4K);
- ebss = .;
-
- /DISCARD/ : {
- *(.eh_frame)
- }
-}
\ No newline at end of file
diff --git a/user/src/syscall.rs b/user/src/syscall.rs
deleted file mode 100644
index 118cf83..0000000
--- a/user/src/syscall.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use core::arch::asm;
-
-const SYSCALL_WRITE: usize = 64;
-const SYSCALL_EXIT: usize = 93;
-
-fn syscall(id: usize, args: [usize; 3]) -> isize {
- let mut ret: isize;
- unsafe {
- asm!(
- "ecall",
- inlateout("x10") args[0] => ret,
- in("x11") args[1],
- in("x12") args[2],
- in("x17") id
- );
- }
- ret
-}
-
-pub fn sys_write(fd: usize, buffer: &[u8]) -> isize {
- syscall(SYSCALL_WRITE, [fd, buffer.as_ptr() as usize, buffer.len()])
-}
-
-pub fn sys_exit(exit_code: i32) -> isize {
- syscall(SYSCALL_EXIT, [exit_code as usize, 0, 0])
-}
\ No newline at end of file