Attempt fix of macOS ARM build.

Fix dingux compilation name

.circleci/config.yml

@@ -1,15 +0,0 @@
-# Use the latest 2.1 version of CircleCI pipeline processing engine, see https://circleci.com/docs/2.0/configuration-reference/
-version: 2.1
-
-# Use a package of configuration called an orb, see https://circleci.com/docs/2.0/orb-intro/
-orbs:
-  # Declare a dependency on the welcome-orb
-  welcome: circleci/welcome-orb@0.3.1
-
-# Orchestrate or schedule a set of jobs, see https://circleci.com/docs/2.0/workflows/
-workflows:
-  # Name the workflow "Welcome"
-  Welcome:
-    # Run the welcome/run job in its own container
-    jobs:
-      - welcome/run

.gitignore

@@ -17,4 +17,24 @@
 /tools/palm/hwTestSuite/TstSuite-sections.ld
 /tools/desktop/build-BufferGraphViewer-*
 /tools/desktop/build-MakePalmBitmap-*
-/tools/desktop/export16BitImageProperly/convert
+/tools/desktop/export16BitImageProperly/convert
+
+# CLion
+.idea/workspace.xml
+.idea/discord.xml
+
+# CMake
+cmake-build-debug/
+cmake-build-release/
+cmake-build-debug-mingw/
+cmake-build-release-mingw/
+cmake-build-debug-visual-studio/
+cmake-build-release-visual-studio/
+cmake-build-debug-visual-studio-1/
+cmake-build-release-visual-studio-1/
+
+# Test ROM
+userdata-palmos41-en-m515.ram
+userdata-en-m515.ram
+palmos41-en-m515.rom
+default-palmos41-en-m515.ram

.gitlab-ci.yml

@@ -0,0 +1,249 @@
+##############################################################################
+################################# BOILERPLATE ################################
+##############################################################################
+
+# Core definitions
+.core-defs:
+  variables:
+    CORENAME: mu
+    JNI_PATH: libretroBuildSystem
+    MAKEFILE_PATH: libretroBuildSystem
+    MAKEFILE: Makefile.libretro
+
+# Inclusion templates, required for the build to work
+include:
+  ################################## DESKTOPS ################################
+  # Windows 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/windows-x64-mingw.yml'
+    
+  # Windows 32-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/windows-i686-mingw.yml'
+
+  # Windows msvc10 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/windows-x64-msvc10-msys2.yml'
+
+  # Windows msvc10 32-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/windows-i686-msvc10-msys2.yml'
+
+  # Windows msvc05 32-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/windows-i686-msvc05-msys2.yml'
+    
+  # Linux 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/linux-x64.yml'
+
+  # MacOS 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/osx-x64.yml'
+  
+  # MacOS ARM 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/osx-arm64.yml'
+
+  ################################## CELLULAR ################################
+  # Android
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/android-jni.yml'
+
+  # iOS 9
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ios9.yml'
+
+  # iOS
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ios-arm64.yml'
+
+  ################################## CONSOLES ################################
+  # Dingux (GCW Zero)
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/dingux-mips32.yml'
+
+  # Nintendo 3DS
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ctr-static.yml'
+
+  # Nintendo GameCube
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ngc-static.yml'
+    
+  # Nintendo Wii
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/wii-static.yml'
+
+  # Nintendo WiiU
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/wiiu-static.yml'
+
+  # Nintendo Switch
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/libnx-static.yml'
+
+  # PLayStation 2
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ps2-static.yml'
+
+  # PlayStation Vita
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/vita-static.yml'
+
+  #################################### MISC ##################################
+  # Emscripten
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/emscripten-static.yml'
+
+# Stages for building
+stages:
+  - build-prepare
+  - build-shared
+  - build-static
+
+##############################################################################
+#################################### STAGES ##################################
+##############################################################################
+
+################################### DESKTOPS #################################
+# Windows 64-bit
+libretro-build-windows-x64:
+  extends:
+    - .libretro-windows-x64-mingw-make-default
+    - .core-defs
+
+# Windows 32-bit
+libretro-build-windows-i686:
+  extends:
+    - .libretro-windows-i686-mingw-make-default
+    - .core-defs
+
+# Windows msvc10 64-bit
+libretro-build-windows-msvc10-x64:
+  extends:
+    - .libretro-windows-x64-msvc10-msys2-make-default
+    - .core-defs
+
+# Windows msvc10 32-bit
+libretro-build-windows-msvc10-i686:
+  extends:
+    - .libretro-windows-i686-msvc10-msys2-make-default
+    - .core-defs
+
+# Windows msvc05 32-bit
+libretro-build-windows-msvc05-i686:
+  extends:
+    - .libretro-windows-i686-msvc05-msys2-make-default
+    - .core-defs
+    
+# Linux 64-bit
+libretro-build-linux-x64:
+  extends:
+    - .libretro-linux-x64-make-default
+    - .core-defs
+
+# MacOS 64-bit
+libretro-build-osx-x64:
+  extends:
+    - .libretro-osx-x64-make-default
+    - .core-defs
+
+# MacOS ARM 64-bit
+libretro-build-osx-arm64:
+  extends:
+    - .libretro-osx-arm64-make-default
+    - .core-defs
+
+################################### CELLULAR #################################
+# Android ARMv7a
+android-armeabi-v7a:
+  extends:
+    - .libretro-android-jni-armeabi-v7a
+    - .core-defs
+
+# Android ARMv8a
+android-arm64-v8a:
+  extends:
+    - .libretro-android-jni-arm64-v8a
+    - .core-defs
+
+# Android 64-bit x86
+android-x86_64:
+  extends:
+    - .libretro-android-jni-x86_64
+    - .core-defs
+
+# Android 32-bit x86
+android-x86:
+  extends:
+    - .libretro-android-jni-x86
+    - .core-defs
+
+# iOS 9
+libretro-build-ios9:
+  extends:
+    - .libretro-ios9-make-default
+    - .core-defs
+
+# iOS
+libretro-build-ios-arm64:
+  extends:
+    - .libretro-ios-arm64-make-default
+    - .core-defs
+
+################################### CONSOLES #################################
+# Dingux (GCW Zero)
+libretro-build-dingux-mips32:
+  extends:
+    - .libretro-dingux-mips32-make-default
+    - .core-defs
+
+# Nintendo 3DS
+libretro-build-ctr:
+  extends:
+    - .libretro-ctr-static-retroarch-master
+    - .core-defs
+
+# Nintendo GameCube
+libretro-build-ngc:
+  extends:
+    - .libretro-ngc-static-retroarch-master
+    - .core-defs
+
+# Nintendo Wii
+libretro-build-wii:
+  extends:
+    - .libretro-wii-static-retroarch-master
+    - .core-defs
+
+# Nintendo Wii U
+libretro-build-wiiu:
+  extends:
+    - .libretro-wiiu-static-retroarch-master
+    - .core-defs
+
+# Nintendo Switch
+libretro-build-libnx-aarch64:
+  extends:
+    - .libretro-libnx-static-retroarch-master
+    - .core-defs
+
+# PlayStation 2
+libretro-build-ps2:
+  extends:
+    - .libretro-ps2-static-retroarch-master
+    - .core-defs
+
+# PlayStation Vita
+libretro-build-vita:
+  extends:
+    - .libretro-vita-static-retroarch-master
+    - .core-defs
+
+#################################### MISC ##################################
+# Emscripten
+libretro-build-emscripten:
+  extends:
+    - .libretro-emscripten-static-retroarch-master
+    - .core-defs

.idea/Mu.iml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module classpath="CMake" type="CPP_MODULE" version="4" />

.idea/misc.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
+  <component name="CidrRootsConfiguration">
+    <sourceRoots>
+      <file path="$PROJECT_DIR$/include" />
+      <file path="$PROJECT_DIR$/src" />
+    </sourceRoots>
+    <excludeRoots>
+      <file path="$PROJECT_DIR$/.github" />
+      <file path="$PROJECT_DIR$/.idea" />
+      <file path="$PROJECT_DIR$/bugs" />
+      <file path="$PROJECT_DIR$/cmake-build-debug-visual-studio-1" />
+      <file path="$PROJECT_DIR$/debugDumps" />
+      <file path="$PROJECT_DIR$/images" />
+      <file path="$PROJECT_DIR$/tools" />
+    </excludeRoots>
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Mu.iml" filepath="$PROJECT_DIR$/.idea/Mu.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

CMakeLists.txt

@@ -0,0 +1,27 @@
+cmake_minimum_required (VERSION 3.13)
+project(Mu
+	VERSION 1.3.0
+	DESCRIPTION "Classic Palm OS Emulator."
+	HOMEPAGE_URL https://github.com/libretro/Mu
+	LANGUAGES C CXX)
+
+# Requires C99
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+
+# To Emily...
+message("******************************")
+message("The continuation of the Mu along with the RetroArch Core is dedicated to")
+message("Emily (1998-2020), your friendship was very important to me and I hope")
+message("that you are resting well.")
+message(" -- Your friend, Stephanie")
+message("******************************")
+
+# Main project sources
+add_subdirectory(src)
+
+# LibRetro Build
+add_subdirectory(libretroBuildSystem)
+
+# QT Build
+add_subdirectory(qtBuildSystem)

LICENSE

@@ -0,0 +1,334 @@
+Creative Commons Legal Code
+
+Attribution-NonCommercial 3.0 Unported
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
+    DAMAGES RESULTING FROM ITS USE.
+
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
+BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
+CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
+CONDITIONS.
+
+1. Definitions
+
+ a. "Adaptation" means a work based upon the Work, or upon the Work and
+    other pre-existing works, such as a translation, adaptation,
+    derivative work, arrangement of music or other alterations of a
+    literary or artistic work, or phonogram or performance and includes
+    cinematographic adaptations or any other form in which the Work may be
+    recast, transformed, or adapted including in any form recognizably
+    derived from the original, except that a work that constitutes a
+    Collection will not be considered an Adaptation for the purpose of
+    this License. For the avoidance of doubt, where the Work is a musical
+    work, performance or phonogram, the synchronization of the Work in
+    timed-relation with a moving image ("synching") will be considered an
+    Adaptation for the purpose of this License.
+ b. "Collection" means a collection of literary or artistic works, such as
+    encyclopedias and anthologies, or performances, phonograms or
+    broadcasts, or other works or subject matter other than works listed
+    in Section 1(f) below, which, by reason of the selection and
+    arrangement of their contents, constitute intellectual creations, in
+    which the Work is included in its entirety in unmodified form along
+    with one or more other contributions, each constituting separate and
+    independent works in themselves, which together are assembled into a
+    collective whole. A work that constitutes a Collection will not be
+    considered an Adaptation (as defined above) for the purposes of this
+    License.
+ c. "Distribute" means to make available to the public the original and
+    copies of the Work or Adaptation, as appropriate, through sale or
+    other transfer of ownership.
+ d. "Licensor" means the individual, individuals, entity or entities that
+    offer(s) the Work under the terms of this License.
+ e. "Original Author" means, in the case of a literary or artistic work,
+    the individual, individuals, entity or entities who created the Work
+    or if no individual or entity can be identified, the publisher; and in
+    addition (i) in the case of a performance the actors, singers,
+    musicians, dancers, and other persons who act, sing, deliver, declaim,
+    play in, interpret or otherwise perform literary or artistic works or
+    expressions of folklore; (ii) in the case of a phonogram the producer
+    being the person or legal entity who first fixes the sounds of a
+    performance or other sounds; and, (iii) in the case of broadcasts, the
+    organization that transmits the broadcast.
+ f. "Work" means the literary and/or artistic work offered under the terms
+    of this License including without limitation any production in the
+    literary, scientific and artistic domain, whatever may be the mode or
+    form of its expression including digital form, such as a book,
+    pamphlet and other writing; a lecture, address, sermon or other work
+    of the same nature; a dramatic or dramatico-musical work; a
+    choreographic work or entertainment in dumb show; a musical
+    composition with or without words; a cinematographic work to which are
+    assimilated works expressed by a process analogous to cinematography;
+    a work of drawing, painting, architecture, sculpture, engraving or
+    lithography; a photographic work to which are assimilated works
+    expressed by a process analogous to photography; a work of applied
+    art; an illustration, map, plan, sketch or three-dimensional work
+    relative to geography, topography, architecture or science; a
+    performance; a broadcast; a phonogram; a compilation of data to the
+    extent it is protected as a copyrightable work; or a work performed by
+    a variety or circus performer to the extent it is not otherwise
+    considered a literary or artistic work.
+ g. "You" means an individual or entity exercising rights under this
+    License who has not previously violated the terms of this License with
+    respect to the Work, or who has received express permission from the
+    Licensor to exercise rights under this License despite a previous
+    violation.
+ h. "Publicly Perform" means to perform public recitations of the Work and
+    to communicate to the public those public recitations, by any means or
+    process, including by wire or wireless means or public digital
+    performances; to make available to the public Works in such a way that
+    members of the public may access these Works from a place and at a
+    place individually chosen by them; to perform the Work to the public
+    by any means or process and the communication to the public of the
+    performances of the Work, including by public digital performance; to
+    broadcast and rebroadcast the Work by any means including signs,
+    sounds or images.
+ i. "Reproduce" means to make copies of the Work by any means including
+    without limitation by sound or visual recordings and the right of
+    fixation and reproducing fixations of the Work, including storage of a
+    protected performance or phonogram in digital form or other electronic
+    medium.
+
+2. Fair Dealing Rights. Nothing in this License is intended to reduce,
+limit, or restrict any uses free from copyright or rights arising from
+limitations or exceptions that are provided for in connection with the
+copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License,
+Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+perpetual (for the duration of the applicable copyright) license to
+exercise the rights in the Work as stated below:
+
+ a. to Reproduce the Work, to incorporate the Work into one or more
+    Collections, and to Reproduce the Work as incorporated in the
+    Collections;
+ b. to create and Reproduce Adaptations provided that any such Adaptation,
+    including any translation in any medium, takes reasonable steps to
+    clearly label, demarcate or otherwise identify that changes were made
+    to the original Work. For example, a translation could be marked "The
+    original work was translated from English to Spanish," or a
+    modification could indicate "The original work has been modified.";
+ c. to Distribute and Publicly Perform the Work including as incorporated
+    in Collections; and,
+ d. to Distribute and Publicly Perform Adaptations.
+
+The above rights may be exercised in all media and formats whether now
+known or hereafter devised. The above rights include the right to make
+such modifications as are technically necessary to exercise the rights in
+other media and formats. Subject to Section 8(f), all rights not expressly
+granted by Licensor are hereby reserved, including but not limited to the
+rights set forth in Section 4(d).
+
+4. Restrictions. The license granted in Section 3 above is expressly made
+subject to and limited by the following restrictions:
+
+ a. You may Distribute or Publicly Perform the Work only under the terms
+    of this License. You must include a copy of, or the Uniform Resource
+    Identifier (URI) for, this License with every copy of the Work You
+    Distribute or Publicly Perform. You may not offer or impose any terms
+    on the Work that restrict the terms of this License or the ability of
+    the recipient of the Work to exercise the rights granted to that
+    recipient under the terms of the License. You may not sublicense the
+    Work. You must keep intact all notices that refer to this License and
+    to the disclaimer of warranties with every copy of the Work You
+    Distribute or Publicly Perform. When You Distribute or Publicly
+    Perform the Work, You may not impose any effective technological
+    measures on the Work that restrict the ability of a recipient of the
+    Work from You to exercise the rights granted to that recipient under
+    the terms of the License. This Section 4(a) applies to the Work as
+    incorporated in a Collection, but this does not require the Collection
+    apart from the Work itself to be made subject to the terms of this
+    License. If You create a Collection, upon notice from any Licensor You
+    must, to the extent practicable, remove from the Collection any credit
+    as required by Section 4(c), as requested. If You create an
+    Adaptation, upon notice from any Licensor You must, to the extent
+    practicable, remove from the Adaptation any credit as required by
+    Section 4(c), as requested.
+ b. You may not exercise any of the rights granted to You in Section 3
+    above in any manner that is primarily intended for or directed toward
+    commercial advantage or private monetary compensation. The exchange of
+    the Work for other copyrighted works by means of digital file-sharing
+    or otherwise shall not be considered to be intended for or directed
+    toward commercial advantage or private monetary compensation, provided
+    there is no payment of any monetary compensation in connection with
+    the exchange of copyrighted works.
+ c. If You Distribute, or Publicly Perform the Work or any Adaptations or
+    Collections, You must, unless a request has been made pursuant to
+    Section 4(a), keep intact all copyright notices for the Work and
+    provide, reasonable to the medium or means You are utilizing: (i) the
+    name of the Original Author (or pseudonym, if applicable) if supplied,
+    and/or if the Original Author and/or Licensor designate another party
+    or parties (e.g., a sponsor institute, publishing entity, journal) for
+    attribution ("Attribution Parties") in Licensor's copyright notice,
+    terms of service or by other reasonable means, the name of such party
+    or parties; (ii) the title of the Work if supplied; (iii) to the
+    extent reasonably practicable, the URI, if any, that Licensor
+    specifies to be associated with the Work, unless such URI does not
+    refer to the copyright notice or licensing information for the Work;
+    and, (iv) consistent with Section 3(b), in the case of an Adaptation,
+    a credit identifying the use of the Work in the Adaptation (e.g.,
+    "French translation of the Work by Original Author," or "Screenplay
+    based on original Work by Original Author"). The credit required by
+    this Section 4(c) may be implemented in any reasonable manner;
+    provided, however, that in the case of a Adaptation or Collection, at
+    a minimum such credit will appear, if a credit for all contributing
+    authors of the Adaptation or Collection appears, then as part of these
+    credits and in a manner at least as prominent as the credits for the
+    other contributing authors. For the avoidance of doubt, You may only
+    use the credit required by this Section for the purpose of attribution
+    in the manner set out above and, by exercising Your rights under this
+    License, You may not implicitly or explicitly assert or imply any
+    connection with, sponsorship or endorsement by the Original Author,
+    Licensor and/or Attribution Parties, as appropriate, of You or Your
+    use of the Work, without the separate, express prior written
+    permission of the Original Author, Licensor and/or Attribution
+    Parties.
+ d. For the avoidance of doubt:
+
+     i. Non-waivable Compulsory License Schemes. In those jurisdictions in
+        which the right to collect royalties through any statutory or
+        compulsory licensing scheme cannot be waived, the Licensor
+        reserves the exclusive right to collect such royalties for any
+        exercise by You of the rights granted under this License;
+    ii. Waivable Compulsory License Schemes. In those jurisdictions in
+        which the right to collect royalties through any statutory or
+        compulsory licensing scheme can be waived, the Licensor reserves
+        the exclusive right to collect such royalties for any exercise by
+        You of the rights granted under this License if Your exercise of
+        such rights is for a purpose or use which is otherwise than
+        noncommercial as permitted under Section 4(b) and otherwise waives
+        the right to collect royalties through any statutory or compulsory
+        licensing scheme; and,
+   iii. Voluntary License Schemes. The Licensor reserves the right to
+        collect royalties, whether individually or, in the event that the
+        Licensor is a member of a collecting society that administers
+        voluntary licensing schemes, via that society, from any exercise
+        by You of the rights granted under this License that is for a
+        purpose or use which is otherwise than noncommercial as permitted
+        under Section 4(c).
+ e. Except as otherwise agreed in writing by the Licensor or as may be
+    otherwise permitted by applicable law, if You Reproduce, Distribute or
+    Publicly Perform the Work either by itself or as part of any
+    Adaptations or Collections, You must not distort, mutilate, modify or
+    take other derogatory action in relation to the Work which would be
+    prejudicial to the Original Author's honor or reputation. Licensor
+    agrees that in those jurisdictions (e.g. Japan), in which any exercise
+    of the right granted in Section 3(b) of this License (the right to
+    make Adaptations) would be deemed to be a distortion, mutilation,
+    modification or other derogatory action prejudicial to the Original
+    Author's honor and reputation, the Licensor will waive or not assert,
+    as appropriate, this Section, to the fullest extent permitted by the
+    applicable national law, to enable You to reasonably exercise Your
+    right under Section 3(b) of this License (right to make Adaptations)
+    but not otherwise.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
+OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
+KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
+WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
+OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
+ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
+ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+ a. This License and the rights granted hereunder will terminate
+    automatically upon any breach by You of the terms of this License.
+    Individuals or entities who have received Adaptations or Collections
+    from You under this License, however, will not have their licenses
+    terminated provided such individuals or entities remain in full
+    compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
+    survive any termination of this License.
+ b. Subject to the above terms and conditions, the license granted here is
+    perpetual (for the duration of the applicable copyright in the Work).
+    Notwithstanding the above, Licensor reserves the right to release the
+    Work under different license terms or to stop distributing the Work at
+    any time; provided, however that any such election will not serve to
+    withdraw this License (or any other license that has been, or is
+    required to be, granted under the terms of this License), and this
+    License will continue in full force and effect unless terminated as
+    stated above.
+
+8. Miscellaneous
+
+ a. Each time You Distribute or Publicly Perform the Work or a Collection,
+    the Licensor offers to the recipient a license to the Work on the same
+    terms and conditions as the license granted to You under this License.
+ b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
+    offers to the recipient a license to the original Work on the same
+    terms and conditions as the license granted to You under this License.
+ c. If any provision of this License is invalid or unenforceable under
+    applicable law, it shall not affect the validity or enforceability of
+    the remainder of the terms of this License, and without further action
+    by the parties to this agreement, such provision shall be reformed to
+    the minimum extent necessary to make such provision valid and
+    enforceable.
+ d. No term or provision of this License shall be deemed waived and no
+    breach consented to unless such waiver or consent shall be in writing
+    and signed by the party to be charged with such waiver or consent.
+ e. This License constitutes the entire agreement between the parties with
+    respect to the Work licensed here. There are no understandings,
+    agreements or representations with respect to the Work not specified
+    here. Licensor shall not be bound by any additional provisions that
+    may appear in any communication from You. This License may not be
+    modified without the mutual written agreement of the Licensor and You.
+ f. The rights granted under, and the subject matter referenced, in this
+    License were drafted utilizing the terminology of the Berne Convention
+    for the Protection of Literary and Artistic Works (as amended on
+    September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
+    Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
+    and the Universal Copyright Convention (as revised on July 24, 1971).
+    These rights and subject matter take effect in the relevant
+    jurisdiction in which the License terms are sought to be enforced
+    according to the corresponding provisions of the implementation of
+    those treaty provisions in the applicable national law. If the
+    standard suite of rights granted under applicable copyright law
+    includes additional rights not granted under this License, such
+    additional rights are deemed to be included in the License; this
+    License is not intended to restrict the license of any rights under
+    applicable law.
+
+
+Creative Commons Notice
+
+    Creative Commons is not a party to this License, and makes no warranty
+    whatsoever in connection with the Work. Creative Commons will not be
+    liable to You or any party on any legal theory for any damages
+    whatsoever, including without limitation any general, special,
+    incidental or consequential damages arising in connection to this
+    license. Notwithstanding the foregoing two (2) sentences, if Creative
+    Commons has expressly identified itself as the Licensor hereunder, it
+    shall have all rights and obligations of Licensor.
+
+    Except for the limited purpose of indicating to the public that the
+    Work is licensed under the CCPL, Creative Commons does not authorize
+    the use by either party of the trademark "Creative Commons" or any
+    related trademark or logo of Creative Commons without the prior
+    written consent of Creative Commons. Any permitted use will be in
+    compliance with Creative Commons' then-current trademark usage
+    guidelines, as may be published on its website or otherwise made
+    available upon request from time to time. For the avoidance of doubt,
+    this trademark restriction does not form part of the License.
+
+    Creative Commons may be contacted at https://creativecommons.org/.

bugs/accidentalFinds.txt

@@ -2,5 +2,6 @@ Bugs in other peoples code I found while writing Mu, haven't followed up on them
 (RetroArch)RETRO_ENVIRONMENT_GET_MIDI_INTERFACE states its passed a pointer to a pointer but its just a pointer to a struct
 (RetroArch)"led_driver" setting is not exposed to GUI
 (RetroArch)retro_set_environment will sometimes be called multiple times and provide invalid values fetching environment variables on the subsequent calls, this will cause function pointers to be corrupted if they are not checked for validity first
+QT will clobber object files when there are 2 source files with the same name even if they are in different folders
 
 Fixed:

bugs/brokenLibretroPlatforms.txt

@@ -1,6 +1,7 @@
 Lakka(needs makefile)
 xbox(don't know)
 xbox360(don't know)
+Android armv5/6, the NDK dropped support for them and they broke when the buildbot was updated
 
 Fixed:
 classics/new haxchi

bugs/currentBug.txt

@@ -1 +1,5 @@
-T3 locks up endlessly checking TSC2101 interrupts
+T3 locks up endlessly checking TSC2101 interrupts
+QT release build is broken
+
+Fixed:
+68K Palm OS randomly locks up for 1-2 seconds(caused by interrupt handling code not turning the CPU back on for masked interrupts when it should because of faulty interrupt cacheing, Caused by commit: 1567cbce674741bc13be92b0847f59a5cc68335a)

bugs/unimplementedHardware.txt

@@ -56,14 +56,15 @@ MakePalmBitmap:
 
 Other:
 Qt port dosent support Windows touchscreen input
-memory dumping dosent work for OS 5 yet
 T3 I2C currently has no ACK bits(should work without them its just inaccurate)(I2C works fine though)
 T3 emulation attempts to set GPIO1(reset button) as an output
 GPIO lines from misc chips to CPU are not implemented
 PXA260 idle mode is unimplemented
+0x0E071F16 MCR	P15, #0, R1, C7, C2, #5 is unimplemented along with several other unknown CP15 opcodes
 
 
 Fixed:
+memory dumping dosent work for OS 5 yet
 Endian compatibility is broken(the CPU state needs to be standardized)
 RetroArch port crashes on exit(needed to check if environ_cb returned true, switched to libretro-common filestreams too)
 make the headers belong to the main file of the target chip being emulated for specs

include/armv5te/armsnippets.h

@@ -0,0 +1,6 @@
+#ifndef H_ARMSNIPPETS
+#define H_ARMSNIPPETS
+
+#define armloader_cb()
+
+#endif

include/armv5te/asmcode.h

@@ -1,7 +1,7 @@
 /* Declarations for asmcode.S */
 
-#ifndef _H_ASMCODE
-#define _H_ASMCODE
+#ifndef H_ASMCODE
+#define H_ASMCODE
 
 #include "emu.h"
 

include/armv5te/cpu.h

@@ -7,10 +7,16 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "fixings.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#if defined(_MSC_VER)
+__pragma(pack(push, 1))
+#endif
+
 typedef struct arm_state {  // Remember to update asmcode.S if this gets rearranged
     uint32_t reg[16];    // Registers for current mode.
 
@@ -41,10 +47,16 @@ typedef struct arm_state {  // Remember to update asmcode.S if this gets rearran
     uint8_t  interrupts;
     uint32_t cpu_events_state; // Only used for suspend and resume!
 }
-#ifndef __EMSCRIPTEN__
+
+#if !defined(__EMSCRIPTEN__) && !defined(_MSC_VER)
 __attribute__((packed))
 #endif
 arm_state;
+
+#if defined(_MSC_VER)
+__pragma(pack(pop))
+#endif
+
 extern struct arm_state arm __asm__("arm");
 
 #define MODE_USR 0x10

include/armv5te/debug.h

@@ -1,6 +1,6 @@
 /* Declarations for debug.c */
-#ifndef _H_DEBUG
-#define _H_DEBUG
+#ifndef H_DEBUG
+#define H_DEBUG
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -10,21 +10,16 @@
 #ifdef __cplusplus
 
 #include <string>
-//extern std::string ln_target_folder;
 
 extern "C" {
 #endif
 
-extern FILE *debugger_input;
-
 /*
-extern bool gdb_connected;
-extern bool in_debugger;
-extern int rdbg_port;
-*/
+extern FILE *debugger_input;
 #define gdb_connected false
 #define in_debugger false
 #define rdbg_port 0
+*/
 
 enum DBG_REASON {
     DBG_USER,
@@ -43,13 +38,7 @@ void rdebug_recv(void);
 bool rdebug_bind(unsigned int port);
 void rdebug_quit();
 */
-#define virt_mem_ptr(x, y) NULL
-#define backtrace(x)
-#define process_debug_cmd(x) 0
 #define debugger(x, y)
-#define rdebug_recv()
-#define rdebug_bind(x) false
-#define rdebug_quit()
 
 #ifdef __cplusplus
 }

include/armv5te/disasm.h

@@ -1,14 +1,15 @@
-#ifndef _H_DISASM
-#define _H_DISASM
+#ifndef H_DISASM
+#define H_DISASM
+
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-extern const char reg_name[16][4];
+extern char disasmReturnBuf[80];
 
 uint32_t disasm_arm_insn(uint32_t pc);
-uint32_t disasm_arm_insn2(uint32_t pc, uint32_t *pc_ptr);
 uint32_t disasm_thumb_insn(uint32_t pc);
 
 #ifdef __cplusplus

include/armv5te/emu.h

@@ -1,5 +1,5 @@
-#ifndef _H_EMU
-#define _H_EMU
+#ifndef H_EMU
+#define H_EMU
 
 #include <stdarg.h>
 #include <stdbool.h>

include/armv5te/mem.h

@@ -1,7 +1,7 @@
 /* Declarations for memory.c */
 
-#ifndef _H_MEM
-#define _H_MEM
+#ifndef H_MEM
+#define H_MEM
 
 #include <stdint.h>
 

include/armv5te/mmu.h

@@ -1,5 +1,5 @@
-#ifndef _H_MMU
-#define _H_MMU
+#ifndef H_MMU
+#define H_MMU
 
 #include "cpu.h"
 #include "emu.h"

include/armv5te/translate.h

@@ -1,21 +1,36 @@
 /* Declarations for translate.c */
 
-#ifndef _H_TRANSLATE
-#define _H_TRANSLATE
+#ifndef H_TRANSLATE
+#define H_TRANSLATE
 
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "fixings.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#if defined(_MSC_VER)
+__pragma(pack(push, 1))
+#endif
+
 struct translation {
     uintptr_t unused;
     void** jump_table;
     uint32_t *start_ptr;
     uint32_t *end_ptr;
-} __attribute__((packed));
+}
+#if !defined(_MSC_VER)
+__attribute__((packed))
+#endif
+;
+
+#if defined(_MSC_VER)
+__pragma(pack(pop))
+#endif
+
 extern struct translation translation_table[] __asm__("translation_table");
 #define INSN_BUFFER_SIZE 0x1000000
 

include/armv5te/uArm/CPU_2.h

@@ -0,0 +1,179 @@
+#ifndef _CPU_H_
+#define _CPU_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//#define ARM_V6		//define to allow v6 instructions
+//#define THUMB_2			//define to allow Thumb2
+
+#include "../../pxa260/pxa260_types.h"
+
+struct ArmCpu;
+
+#define ARM_SR_N		0x80000000UL
+#define ARM_SR_Z		0x40000000UL
+#define ARM_SR_C		0x20000000UL
+#define ARM_SR_V		0x10000000UL
+#define ARM_SR_Q		0x08000000UL
+#ifdef ARM_V6	//V6KT2, but without T2 to be exact (we implement things like MLS, but not Thumb2 or ThumbEE)
+	#define ARM_SR_J	0x01000000UL
+	#define ARM_SR_E	0x00000200UL
+	#define ARM_SR_A	0x00000100UL
+	#define ARM_SR_GE_0	0x00010000UL
+	#define ARM_SR_GE_1	0x00020000UL
+	#define ARM_SR_GE_2	0x00040000UL
+	#define ARM_SR_GE_3	0x00080000UL
+	#define ARM_SR_GE_MASK	0x000F0000UL
+	#define ARM_SR_GE_SHIFT	16
+#endif
+#define ARM_SR_I		0x00000080UL
+#define ARM_SR_F		0x00000040UL
+#define ARM_SR_T		0x00000020UL
+#define ARM_SR_M		0x0000001FUL
+
+#define ARM_SR_MODE_USR		0x00000010UL
+#define ARM_SR_MODE_FIQ		0x00000011UL
+#define ARM_SR_MODE_IRQ		0x00000012UL
+#define ARM_SR_MODE_SVC		0x00000013UL
+#define ARM_SR_MODE_ABT		0x00000017UL
+#define ARM_SR_MODE_UND		0x0000001BUL
+#define ARM_SR_MODE_SYS		0x0000001FUL
+
+#define ARV_VECTOR_OFFT_RST	0x00000000UL
+#define ARM_VECTOR_OFFT_UND	0x00000004UL
+#define ARM_VECTOR_OFFT_SWI	0x00000008UL
+#define ARM_VECTOR_OFFT_P_ABT	0x0000000CUL
+#define ARM_VECTOR_OFFT_D_ABT	0x00000010UL
+#define ARM_VECTOR_OFFT_UNUSED	0x00000014UL
+#define ARM_VECTOR_OFFT_IRQ	0x00000018UL
+#define ARM_VECTOR_OFFT_FIQ	0x0000001CUL
+
+#define HYPERCALL_ARM		0xF7BBBBBBUL
+#define HYPERCALL_THUMB		0xBBBBUL
+
+//the following are for cpuGetRegExternal() and are generally used for debugging purposes
+#define ARM_REG_NUM_CPSR	16
+#define ARM_REG_NUM_SPSR	17
+
+struct ArmCpu;
+
+typedef Boolean	(*ArmCoprocRegXferF)	(struct ArmCpu* cpu, void* userData, Boolean two/* MCR2/MRC2 ? */, Boolean MRC, UInt8 op1, UInt8 Rx, UInt8 CRn, UInt8 CRm, UInt8 op2);
+typedef Boolean	(*ArmCoprocDatProcF)	(struct ArmCpu* cpu, void* userData, Boolean two/* CDP2 ? */, UInt8 op1, UInt8 CRd, UInt8 CRn, UInt8 CRm, UInt8 op2);
+typedef Boolean	(*ArmCoprocMemAccsF)	(struct ArmCpu* cpu, void* userData, Boolean two /* LDC2/STC2 ? */, Boolean N, Boolean store, UInt8 CRd, UInt32 addr, UInt8* option /* NULL if none */);
+typedef Boolean (*ArmCoprocTwoRegF)	(struct ArmCpu* cpu, void* userData, Boolean MRRC, UInt8 op, UInt8 Rd, UInt8 Rn, UInt8 CRm);
+
+typedef Boolean	(*ArmCpuMemF)		(struct ArmCpu* cpu, void* buf, UInt32 vaddr, UInt8 size, Boolean write, Boolean priviledged, UInt8* fsr);	//read/write
+typedef Boolean	(*ArmCpuHypercall)	(struct ArmCpu* cpu);		//return true if handled
+typedef void	(*ArmCpuEmulErr)	(struct ArmCpu* cpu, const char* err_str);
+
+typedef void	(*ArmSetFaultAdrF)	(struct ArmCpu* cpu, UInt32 adr, UInt8 faultStatus);
+
+#include "icache.h"
+
+
+/*
+
+	coprocessors:
+				
+				0    - DSP (pxa only)
+				0, 1 - WMMX (pxa only)
+				11   - VFP (arm standard)
+				15   - system control (arm standard)
+*/
+
+
+typedef struct{
+	
+	ArmCoprocRegXferF regXfer;
+	ArmCoprocDatProcF dataProcessing;
+	ArmCoprocMemAccsF memAccess;
+	ArmCoprocTwoRegF  twoRegF;
+	void* userData;
+	
+}ArmCoprocessor;
+
+typedef struct{
+
+	UInt32 R13, R14;
+	UInt32 SPSR;			//usr mode doesn't have an SPSR
+}ArmBankedRegs;
+
+
+
+
+
+
+
+
+typedef struct ArmCpu{
+
+	UInt32		regs[16];		//current active regs as per current mode
+	UInt32		CPSR, SPSR;
+
+	ArmBankedRegs	bank_usr;		//usr regs when in another mode
+	ArmBankedRegs	bank_svc;		//svc regs when in another mode
+	ArmBankedRegs	bank_abt;		//abt regs when in another mode
+	ArmBankedRegs	bank_und;		//und regs when in another mode
+	ArmBankedRegs	bank_irq;		//irq regs when in another mode
+	ArmBankedRegs	bank_fiq;		//fiq regs when in another mode
+	UInt32		extra_regs[5];		//fiq regs when not in fiq mode, usr regs when in fiq mode. R8-12
+
+	UInt16		waitingIrqs;
+	UInt16		waitingFiqs;
+	UInt16		CPAR;
+
+	ArmCoprocessor	coproc[16];		//coprocessors
+
+	// various other cpu config options
+	UInt32		vectorBase;		//address of vector base
+
+#ifdef ARM_V6
+
+	Boolean		EEE;			//endianness one exception entry
+	Boolean		impreciseAbtWaiting;
+#endif
+
+	ArmCpuMemF	memF;
+	ArmCpuEmulErr	emulErrF;
+	ArmCpuHypercall	hypercallF;
+	ArmSetFaultAdrF	setFaultAdrF;
+	
+	icache		ic;
+
+	void*		userData;		//shared by all callbacks
+}ArmCpu;
+
+
+Err cpuInit(ArmCpu* cpu, UInt32 pc, ArmCpuMemF memF, ArmCpuEmulErr emulErrF, ArmCpuHypercall hypercallF, ArmSetFaultAdrF setFaultAdrF);
+Err cpuDeinit(ArmCpu* cp);
+void cpuCycle(ArmCpu* cpu);
+void cpuIrq(ArmCpu* cpu, Boolean fiq, Boolean raise);	//unraise when acknowledged
+
+#ifdef ARM_V6
+
+	void cpuSignalImpreciseAbt(ArmCpu* cpu, Boolean raise);
+	
+#endif
+
+UInt32 cpuGetRegExternal(ArmCpu* cpu, UInt8 reg);
+void cpuSetReg(ArmCpu* cpu, UInt8 reg, UInt32 val);
+
+void cpuCoprocessorRegister(ArmCpu* cpu, UInt8 cpNum, ArmCoprocessor* coproc);
+void cpuCoprocessorUnregister(ArmCpu* cpu, UInt8 cpNum);
+
+void cpuSetVectorAddr(ArmCpu* cpu, UInt32 adr);
+
+UInt16 cpuGetCPAR(ArmCpu* cpu);
+void cpuSetCPAR(ArmCpu* cpu, UInt16 cpar);
+
+void cpuIcacheInval(ArmCpu* cpu);
+void cpuIcacheInvalAddr(ArmCpu* cpu, UInt32 addr);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

include/armv5te/uArm/icache.h

@@ -0,0 +1,47 @@
+#ifndef ICACHE_H
+#define ICACHE_H
+
+
+#include "../../pxa260/pxa260_types.h"
+#include "CPU_2.h"
+
+
+#define ICACHE_L		5UL	//line size is 2^L bytes
+#define ICACHE_S		6UL	//number of sets is 2^S
+#define ICACHE_A		3UL	//set associativity
+
+
+#define ICACHE_LINE_SZ		(1UL << ICACHE_L)
+#define ICACHE_BUCKET_NUM	(1UL << ICACHE_S)
+#define ICACHE_BUCKET_SZ	(ICACHE_A)
+
+
+#define ICACHE_ADDR_MASK	((UInt32)-ICACHE_LINE_SZ)
+#define ICACHE_USED_MASK	1UL
+#define ICACHE_PRIV_MASK	2UL
+
+typedef struct{
+
+	UInt32 info;	//addr, masks
+	UInt8 data[ICACHE_LINE_SZ];
+	
+}icacheLine;
+
+typedef struct{
+
+	struct ArmCpu* cpu;
+	ArmCpuMemF memF;
+	icacheLine lines[ICACHE_BUCKET_NUM][ICACHE_BUCKET_SZ];
+	UInt8 ptr[ICACHE_BUCKET_NUM];
+
+}icache;
+
+
+void icacheInit(icache* ic, struct ArmCpu* cpu, ArmCpuMemF memF);
+Boolean icacheFetch(icache* ic, UInt32 va, UInt8 sz, Boolean priviledged, UInt8* fsr, void* buf);
+void icacheInval(icache* ic);
+void icacheInvalAddr(icache* ic, UInt32 addr);
+
+
+
+#endif

include/armv5te/uArm/uArmGlue.h

@@ -0,0 +1,21 @@
+#ifndef UARM_GLUE_H
+#define UARM_GLUE_H
+
+#include "CPU_2.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+Boolean	uArmMemAccess(struct ArmCpu* cpu, void* buf, UInt32 vaddr, UInt8 size, Boolean write, Boolean priviledged, UInt8* fsr);	//read/write
+Boolean	uArmHypercall(struct ArmCpu* cpu);//return true if handled
+void	uArmEmulErr	(struct ArmCpu* cpu, const char* err_str);
+void	uArmSetFaultAddr(struct ArmCpu* cpu, UInt32 adr, UInt8 faultStatus);
+
+void uArmInitCpXX(ArmCpu* cpu);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

include/dbvz.h

@@ -66,15 +66,19 @@ typedef struct{
 //variables
 extern dbvz_chip_t dbvzChipSelects[];
 extern uint8_t     dbvzReg[];//needed for direct execution of the DBVZ regs without a RAM access function
+extern uint16_t*   dbvzFramebuffer;
+extern uint16_t    dbvzFramebufferWidth;
+extern uint16_t    dbvzFramebufferHeight;
 
 //CPU
+void dbvzLcdRender(void);
 bool dbvzIsPllOn(void);
 bool m515BacklightAmplifierState(void);
 bool dbvzAreRegistersXXFFMapped(void);
 bool sed1376ClockConnected(void);
 void ads7846OverridePenState(bool value);
-void m515RefreshTouchState(void);//just refreshes the touchscreen
-void m515RefreshInputState(void);//refreshes touchscreen, buttons and docked status
+void m5XXRefreshTouchState(void);//just refreshes the touchscreen
+void m5XXRefreshInputState(void);//refreshes touchscreen, buttons and docked status
 //int32_t interruptAcknowledge(int32_t intLevel);//this is in m68kexternal.h
 
 //memory errors

include/dbvzRegisterAccessors.c.h

@@ -20,19 +20,15 @@ static void registerArrayWrite32(uint32_t address, uint32_t value){M68K_BUFFER_W
 
 //interrupt setters, used for setting an interrupt with masking by IMR and logging in IPR
 static void setIprIsrBit(uint32_t interruptBit){
-   uint32_t ipr = registerArrayRead32(IPR);
-   dbvzInterruptChanged |= !(ipr & interruptBit);
-   ipr |= interruptBit;
-   registerArrayWrite32(IPR, ipr);
-   registerArrayWrite32(ISR, ipr & ~registerArrayRead32(IMR));
+   uint32_t newIpr = registerArrayRead32(IPR) | interruptBit;
+   registerArrayWrite32(IPR, newIpr);
+   registerArrayWrite32(ISR, newIpr & ~registerArrayRead32(IMR));
 }
 
 static void clearIprIsrBit(uint32_t interruptBit){
-   uint32_t ipr = registerArrayRead32(IPR);
-   dbvzInterruptChanged |= !!(ipr & interruptBit);
-   ipr &= ~interruptBit;
-   registerArrayWrite32(IPR, ipr);
-   registerArrayWrite32(ISR, ipr & ~registerArrayRead32(IMR));
+   uint32_t newIpr = registerArrayRead32(IPR) & ~interruptBit;
+   registerArrayWrite32(IPR, newIpr);
+   registerArrayWrite32(ISR, newIpr & ~registerArrayRead32(IMR));
 }
 
 //SPI1 FIFO accessors
@@ -341,11 +337,11 @@ static void updateCsdAddressLines(void){
       dbvzChipSelects[DBVZ_CHIP_DX_RAM].mask = 0x003FFFFF;
 
       //address line 23 is enabled
-      if((sdctrl & 0x000C) == 0x0008)
+      if(!palmEmulatingM500 && (sdctrl & 0x000C) == 0x0008)
          dbvzChipSelects[DBVZ_CHIP_DX_RAM].mask |= 0x00800000;
 
       //address line 22 is enabled
-      if((sdctrl & 0x0030) == 0x0010)
+      if(palmEmulatingM500 || (sdctrl & 0x0030) == 0x0010)
          dbvzChipSelects[DBVZ_CHIP_DX_RAM].mask |= 0x00400000;
    }
    else{
@@ -571,7 +567,7 @@ static void updateUart1PortState(void){
       properties.oddParity = !!(ustcnt1 & 0x0400);
       properties.stopBits = !!(ustcnt1 & 0x0200) ? 2 : 1;
       properties.use8BitMode = !!(ustcnt1 & 0x0100);
-      properties.baudRate = (baudSrc ? EMU_SERIAL_USE_EXTERNAL_CLOCK_SOURCE : sysclksPerClk32() * M515_CRYSTAL_FREQUENCY) / prescaler / divider;
+      properties.baudRate = (baudSrc ? EMU_SERIAL_USE_EXTERNAL_CLOCK_SOURCE : sysclksPerClk32() * M5XX_CRYSTAL_FREQUENCY) / prescaler / divider;
 
       palmIrSetPortProperties(&properties);
    }
@@ -649,7 +645,7 @@ static void updateUart2PortState(void){
       properties.oddParity = !!(ustcnt2 & 0x0400);
       properties.stopBits = !!(ustcnt2 & 0x0200) ? 2 : 1;
       properties.use8BitMode = !!(ustcnt2 & 0x0100);
-      properties.baudRate = (baudSrc ? EMU_SERIAL_USE_EXTERNAL_CLOCK_SOURCE : sysclksPerClk32() * M515_CRYSTAL_FREQUENCY) / prescaler / divider;
+      properties.baudRate = (baudSrc ? EMU_SERIAL_USE_EXTERNAL_CLOCK_SOURCE : sysclksPerClk32() * M5XX_CRYSTAL_FREQUENCY) / prescaler / divider;
 
       palmSerialSetPortProperties(&properties);
    }
@@ -815,7 +811,6 @@ static void setIsr(uint32_t value, bool useTopWord, bool useBottomWord){
       registerArrayWrite16(ISR + 2, registerArrayRead16(ISR + 2) & ~(value & 0xFFFF & portDEdgeSelect << 8));
    }
 
-   dbvzInterruptChanged |= true;
    checkInterrupts();
 }
 
@@ -989,10 +984,6 @@ static void updateSdCardChipSelectStatus(void){
    sdCardSetChipSelect(!!(getPortJValue() & 0x08));
 }
 
-static void updateBacklightAmplifierStatus(void){
-   palmMisc.backlightLevel = (palmMisc.backlightLevel > 0) ? (50 + m515BacklightAmplifierState() * 50) : 0;
-}
-
 static void updateTouchState(void){
    if(!(registerArrayRead8(PFSEL) & registerArrayRead8(PFDIR) & 0x02)){
       if((ads7846PenIrqEnabled ? !palmInput.touchscreenTouched : true) == !!(registerArrayRead16(ICR) & 0x0080))

include/dbvzRegisterNames.c.h

@@ -150,12 +150,16 @@
 #define LCWCH     0xA1C/*Cursor Width & Height Register*/
 #define LBLKC     0xA1F/*Blink Control Register*/
 #define LPICF     0xA20/*Panel Interface Config Register*/
+#define LPOLCF    0xA21/*LCD Polarity Configuration Register*/
+#define LACDRC    0xA23/*LACD Rate Control Register*/
 #define LPXCD     0xA25/*Pixel Clock Divider Register*/
 #define LCKCON    0xA27/*Clocking Control Register*/
 #define LRRA      0xA28/*LCD Refresh Rate Adjustment Register*/
 /*Reserved        0xA2B  Octet Terminal Count Register On Original Dragonball*/
+#define LPOSR     0xA2D/*LCD Panning Offset Register*/
 #define LFRCM     0xA31/*Frame Rate Control Modulation Register*/
 #define LGPMR     0xA33/*Gray Palette Mapping Register*/
+#define PWMR      0xA36/*PWM Contrast Control Register*/
 #define DMACR     0xA39/*DMA Control Register*/
 
 /*RTC - Real Time Clock*/

include/dbvzTiming.c.h

@@ -169,35 +169,35 @@ static void rtiInterruptClk32(void){
    //this function is part of endClk32();
    uint16_t triggeredRtiInterrupts = 0x0000;
 
-   if(clk32Counter % (M515_CRYSTAL_FREQUENCY / 512) == 0){
+   if(clk32Counter % (M5XX_CRYSTAL_FREQUENCY / 512) == 0){
       //RIS7 - 512HZ
       triggeredRtiInterrupts |= 0x8000;
    }
-   if(clk32Counter % (M515_CRYSTAL_FREQUENCY / 256) == 0){
+   if(clk32Counter % (M5XX_CRYSTAL_FREQUENCY / 256) == 0){
       //RIS6 - 256HZ
       triggeredRtiInterrupts |= 0x4000;
    }
-   if(clk32Counter % (M515_CRYSTAL_FREQUENCY / 128) == 0){
+   if(clk32Counter % (M5XX_CRYSTAL_FREQUENCY / 128) == 0){
       //RIS5 - 128HZ
       triggeredRtiInterrupts |= 0x2000;
    }
-   if(clk32Counter % (M515_CRYSTAL_FREQUENCY / 64) == 0){
+   if(clk32Counter % (M5XX_CRYSTAL_FREQUENCY / 64) == 0){
       //RIS4 - 64HZ
       triggeredRtiInterrupts |= 0x1000;
    }
-   if(clk32Counter % (M515_CRYSTAL_FREQUENCY / 32) == 0){
+   if(clk32Counter % (M5XX_CRYSTAL_FREQUENCY / 32) == 0){
       //RIS3 - 32HZ
       triggeredRtiInterrupts |= 0x0800;
    }
-   if(clk32Counter % (M515_CRYSTAL_FREQUENCY / 16) == 0){
+   if(clk32Counter % (M5XX_CRYSTAL_FREQUENCY / 16) == 0){
       //RIS2 - 16HZ
       triggeredRtiInterrupts |= 0x0400;
    }
-   if(clk32Counter % (M515_CRYSTAL_FREQUENCY / 8) == 0){
+   if(clk32Counter % (M5XX_CRYSTAL_FREQUENCY / 8) == 0){
       //RIS1 - 8HZ
       triggeredRtiInterrupts |= 0x0200;
    }
-   if(clk32Counter % (M515_CRYSTAL_FREQUENCY / 4) == 0){
+   if(clk32Counter % (M5XX_CRYSTAL_FREQUENCY / 4) == 0){
       //RIS0 - 4HZ
       triggeredRtiInterrupts |= 0x0100;
    }
@@ -363,7 +363,7 @@ static void dbvzBeginClk32(void){
 
 static void dbvzEndClk32(void){
    //second position counter
-   if(clk32Counter >= M515_CRYSTAL_FREQUENCY - 1){
+   if(clk32Counter >= M5XX_CRYSTAL_FREQUENCY - 1){
       clk32Counter = 0;
       rtcAddSecondClk32();
    }
@@ -417,11 +417,11 @@ static void dbvzAddSysclks(double count){
 }
 
 static int32_t audioGetFramePercentIncrementFromClk32s(int32_t count){
-   return (double)count / ((double)M515_CRYSTAL_FREQUENCY / EMU_FPS) * DBVZ_AUDIO_END_OF_FRAME;
+   return (double)count / ((double)M5XX_CRYSTAL_FREQUENCY / EMU_FPS) * DBVZ_AUDIO_END_OF_FRAME;
 }
 
 static int32_t audioGetFramePercentIncrementFromSysclks(double count){
-   return count / (dbvzSysclksPerClk32 * ((double)M515_CRYSTAL_FREQUENCY / EMU_FPS)) * DBVZ_AUDIO_END_OF_FRAME;
+   return count / (dbvzSysclksPerClk32 * ((double)M5XX_CRYSTAL_FREQUENCY / EMU_FPS)) * DBVZ_AUDIO_END_OF_FRAME;
 }
 
 static int32_t audioGetFramePercentage(void){

include/emulator.h

@@ -12,7 +12,7 @@ extern "C" {
 #include <stdio.h>
 
 #include "audio/blip_buf.h"
-#include "m515Bus.h"//for size macros
+#include "m5XXBus.h"//for size macros
 
 //DEFINE INFO!!!
 //define EMU_SUPPORT_PALM_OS5 to compile in Tungsten T3 support(not reccomended for low power devices)
@@ -22,7 +22,6 @@ extern "C" {
 //define EMU_BIG_ENDIAN on big endian systems
 //define EMU_HAVE_FILE_LAUNCHER to enable launching files from the host system
 //to enable degguging define EMU_DEBUG, all options below do nothing unless EMU_DEBUG is defined
-//to enable sandbox debugging define EMU_SANDBOX
 //to enable memory access logging define EMU_SANDBOX_LOG_MEMORY_ACCESSES
 //to enable opcode level debugging define EMU_SANDBOX_OPCODE_LEVEL_DEBUG
 //to enable flow control logging define EMU_SANDBOX_LOG_JUMPS, EMU_SANDBOX_OPCODE_LEVEL_DEBUG must also be defined for this to work
@@ -61,7 +60,8 @@ static void debugLog(char* str, ...){};
 #define DBVZ_CPU_PERCENT_WAITING 0.30//account for wait states when reading memory, tested with SysInfo.prc
 #define DBVZ_AUDIO_MAX_CLOCK_RATE 235929600//smallest amount of time a second can be split into:(2.0 * (14.0 * (255 + 1.0) + 15 + 1.0)) * 32768 == 235929600, used to convert the variable timing of SYSCLK and CLK32 to a fixed location in the current frame 0<->AUDIO_END_OF_FRAME
 #define DBVZ_AUDIO_END_OF_FRAME (DBVZ_AUDIO_MAX_CLOCK_RATE / EMU_FPS)
-#define M515_CRYSTAL_FREQUENCY 32768
+#define M5XX_CRYSTAL_FREQUENCY 32768
+#define SAVE_STATE_FOR_M500 0x40000000
 #if defined(EMU_SUPPORT_PALM_OS5)
 #define TUNGSTEN_T3_CPU_PERCENT_WAITING 0.30//TODO: dont know ARM CPU speeds yet
 #define TUNGSTEN_T3_CPU_CRYSTAL_FREQUENCY 3686400
@@ -97,6 +97,15 @@ enum{
 #define EMU_SERIAL_FRAME_ERROR 0x200
 #define EMU_SERIAL_BREAK (EMU_SERIAL_PARITY_ERROR | 0x00)
 
+//emulated devices
+enum{
+   EMU_DEVICE_PALM_M500 = 0,
+   EMU_DEVICE_PALM_M515
+#if defined(EMU_SUPPORT_PALM_OS5)
+   ,EMU_DEVICE_TUNGSTEN_T3
+#endif
+};
+
 //types
 typedef struct{
    bool     enable;
@@ -176,6 +185,7 @@ typedef struct{
 #if defined(EMU_SUPPORT_PALM_OS5)
 extern bool      palmEmulatingTungstenT3;//read allowed, but not advised
 #endif
+extern bool      palmEmulatingM500;//dont touch
 extern uint8_t*  palmRom;//dont touch
 extern uint8_t*  palmRam;//access allowed to read save RAM without allocating a giant buffer, but endianness must be taken into account
 extern input_t   palmInput;//write allowed
@@ -203,7 +213,7 @@ extern void      (*palmSerialDataFlush)(void);//called by the emulator to delete
 extern void      (*palmGetRtcFromHost)(uint8_t* writeBack);//[0] = hours, [1] = minutes, [2] = seconds
 
 //functions
-uint32_t emulatorInit(uint8_t* palmRomData, uint32_t palmRomSize, uint8_t* palmBootloaderData, uint32_t palmBootloaderSize, bool syncRtc, bool allowInvalidBehavior);
+uint32_t emulatorInit(uint8_t emulatedDevice, uint8_t* palmRomData, uint32_t palmRomSize, uint8_t* palmBootloaderData, uint32_t palmBootloaderSize, bool syncRtc, bool allowInvalidBehavior);
 void emulatorDeinit(void);
 void emulatorHardReset(void);
 void emulatorSoftReset(void);

include/fixings.h

@@ -0,0 +1,18 @@
+//
+// Created by xer on 2021-07-15.
+//
+
+#ifndef MU_FIXINGS_H
+#define MU_FIXINGS_H
+
+/* Fixes for Visual Studio. */
+#if defined(_MSC_VER)
+	/* Prevent any assembly references from being used. */
+	#define __asm__(what)
+
+	/* GCC's __builtin_popcount */
+	#include <intrin.h>
+	#define __builtin_popcount __popcnt
+#endif
+
+#endif // MU_FIXINGS_H

include/m5XXBus.h

@@ -1,5 +1,5 @@
-#ifndef M515_BUS_H
-#define M515_BUS_H
+#ifndef M5XX_BUS_H
+#define M5XX_BUS_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -20,7 +20,8 @@
 //and the SED1376 is at 0x1FF80000(+ 0x20000 for framebuffer)
 #define DBVZ_EMUCS_START_ADDRESS 0xFFFC0000
 #define DBVZ_REG_START_ADDRESS 0xFFFFF000
-#define M515_ROM_SIZE (4 * 0x100000)//4mb ROM
+#define M5XX_ROM_SIZE (4 * 0x100000)//4mb ROM
+#define M500_RAM_SIZE (8 * 0x100000)//16mb RAM
 #define M515_RAM_SIZE (16 * 0x100000)//16mb RAM
 #define DBVZ_EMUCS_SIZE 0x20000
 #define DBVZ_REG_SIZE 0x1000//is actually 0xE00 without bootloader

include/m68k/m68k.h

@@ -218,6 +218,7 @@ void m68k_write_memory_32_pd(uint32_t address, uint32_t value);
  */
 void m68k_set_int_ack_callback(int32_t  (*callback)(int32_t int_level));
 
+
 /* Set the callback for a breakpoint acknowledge (68010+).
  * You must enable M68K_EMULATE_BKPT_ACK in m68kconf.h.
  * The CPU will call the callback with whatever was in the data field of the
@@ -226,6 +227,7 @@ void m68k_set_int_ack_callback(int32_t  (*callback)(int32_t int_level));
  */
 void m68k_set_bkpt_ack_callback(void (*callback)(uint32_t data));
 
+
 /* Set the callback for the RESET instruction.
  * You must enable M68K_EMULATE_RESET in m68kconf.h.
  * The CPU calls this callback every time it encounters a RESET instruction.
@@ -233,6 +235,7 @@ void m68k_set_bkpt_ack_callback(void (*callback)(uint32_t data));
  */
 void m68k_set_reset_instr_callback(void  (*callback)(void));
 
+
 /* Set the callback for informing of a large PC change.
  * You must enable M68K_MONITOR_PC in m68kconf.h.
  * The CPU calls this callback with the new PC value every time the PC changes
@@ -241,20 +244,6 @@ void m68k_set_reset_instr_callback(void  (*callback)(void));
  */
 void m68k_set_pc_changed_callback(void  (*callback)(uint32_t new_pc));
 
-/* Set the callback for the TAS instruction.
- * You must enable M68K_TAS_HAS_CALLBACK in m68kconf.h.
- * The CPU calls this callback every time it encounters a TAS instruction.
- * Default behavior: return 1, allow writeback.
- */
-void m68k_set_tas_instr_callback(int32_t  (*callback)(void));
-
-/* Set the callback for illegal instructions.
- * You must enable M68K_ILLG_HAS_CALLBACK in m68kconf.h.
- * The CPU calls this callback every time it encounters an illegal instruction
- * which must return 1 if it handles the instruction normally or 0 if it's really an illegal instruction.
- * Default behavior: return 0, exception will occur.
- */
-void m68k_set_illg_instr_callback(int32_t  (*callback)(int32_t));
 
 /* Set the callback for CPU function code changes.
  * You must enable M68K_EMULATE_FC in m68kconf.h.
@@ -265,6 +254,7 @@ void m68k_set_illg_instr_callback(int32_t  (*callback)(int32_t));
  */
 void m68k_set_fc_callback(void  (*callback)(uint32_t new_fc));
 
+
 /* Set a callback for the instruction cycle of the CPU.
  * You must enable M68K_INSTRUCTION_HOOK in m68kconf.h.
  * The CPU calls this callback just before fetching the opcode in the
@@ -349,7 +339,7 @@ void m68k_set_reg(m68k_register_t reg, uint32_t value);
 /* Check if an instruction is valid for the specified CPU type */
 uint32_t m68k_is_valid_instruction(uint32_t instruction, uint32_t cpu_type);
 
-/* Disassemble 1 instruction using the epecified CPU type at pc.  Stores
+/* Disassemble 1 instruction using the specified CPU type at pc.  Stores
  * disassembly in str_buff and returns the size of the instruction in bytes.
  */
 uint32_t m68k_disassemble(char* str_buff, uint32_t pc, uint32_t cpu_type);

include/m68k/m68kconf.h

@@ -57,7 +57,6 @@
 #define M68K_EMULATE_010            OPT_OFF
 #define M68K_EMULATE_EC020          OPT_OFF
 #define M68K_EMULATE_020            OPT_OFF
-#define M68K_EMULATE_040            OPT_ON
 
 
 /* If ON, the CPU will call m68k_read_immediate_xx() for immediate addressing
@@ -101,41 +100,13 @@
 #define M68K_EMULATE_TRACE          OPT_OFF
 #endif
 
+
 /* If ON, CPU will call the output reset callback when it encounters a reset
  * instruction.
  */
 #define M68K_EMULATE_RESET          OPT_SPECIFY_HANDLER
 #define M68K_RESET_CALLBACK()       emulatorSoftReset()
 
-/* If ON, CPU will call the callback when it encounters a cmpi.l #v, dn
- * instruction.
- */
-#define M68K_CMPILD_HAS_CALLBACK     OPT_OFF
-#define M68K_CMPILD_CALLBACK(v,r)    your_cmpild_handler_function(v,r)
-
-
-/* If ON, CPU will call the callback when it encounters a rte
- * instruction.
- */
-#define M68K_RTE_HAS_CALLBACK       OPT_OFF
-#define M68K_RTE_CALLBACK()         your_rte_handler_function()
-
-/* If ON, CPU will call the callback when it encounters a tas
- * instruction.
- */
-#define M68K_TAS_HAS_CALLBACK       OPT_OFF
-#define M68K_TAS_CALLBACK()         your_tas_handler_function()
-
-/* If ON, CPU will call the callback when it encounters an illegal instruction
- * passing the opcode as argument. If the callback returns 1, then it's considered
- * as a normal instruction, and the illegal exception in canceled. If it returns 0,
- * the exception occurs normally.
- * The callback looks like int callback(int opcode)
- * You should put OPT_SPECIFY_HANDLER here if you cant to use it, otherwise it will
- * use a dummy default handler and you'll have to call m68k_set_illg_instr_callback explicitely
- */
-#define M68K_ILLG_HAS_CALLBACK	    OPT_OFF
-#define M68K_ILLG_CALLBACK(opcode)   op_illg(opcode)
 
 /* If ON, CPU will call the set fc callback on every memory access to
  * differentiate between user/supervisor, program/data access like a real
@@ -146,6 +117,7 @@
 #define M68K_EMULATE_FC             OPT_OFF
 #define M68K_SET_FC_CALLBACK(A)     your_set_fc_handler_function(A)
 
+
 /* If ON, CPU will call the pc changed callback when it changes the PC by a
  * large value.  This allows host programs to be nicer when it comes to
  * fetching immediate data and instructions on a banked memory system.
@@ -161,12 +133,8 @@
 /* If ON, CPU will call the instruction hook callback before every
  * instruction.
  */
-#if defined(EMU_DEBUG) && defined(EMU_SANDBOX) && defined(EMU_SANDBOX_OPCODE_LEVEL_DEBUG)
-#define M68K_INSTRUCTION_HOOK       OPT_SPECIFY_HANDLER
-#else
 #define M68K_INSTRUCTION_HOOK       OPT_OFF
-#endif
-#define M68K_INSTRUCTION_CALLBACK() sandboxOnOpcodeRun()
+#define M68K_INSTRUCTION_CALLBACK() on_opcode_run()
 
 
 /* If ON, the CPU will emulate the 4-byte prefetch queue of a real 68000.
@@ -210,6 +178,7 @@
  * possibly even making the speed worse than with just 32 bits.
  */
 
+
 /* ======================================================================== */
 /* ============================== END OF FILE ============================= */
 /* ======================================================================== */

include/m68k/m68kcpu.h

@@ -1764,7 +1764,7 @@ static inline void m68ki_exception_1010(void)
 {
    uint sr;
 #if M68K_LOG_1010_1111 == OPT_ON
-   M68K_DO_LOG_EMU((M68K_LOG_FILEHANDLE "%s at %08x: called 1010 instruction %04x (%s)\n",
+   M68K_DO_LOG_EMU((M68K_LOG_FILEHANDLE "%s at %08X: called 1010 instruction %04X (%s)\n",
                 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PPC), REG_IR,
                 m68ki_disassemble_quick(ADDRESS_68K(REG_PPC))));
 #endif
@@ -1783,7 +1783,7 @@ static inline void m68ki_exception_1111(void)
    uint sr;
 
 #if M68K_LOG_1010_1111 == OPT_ON
-   M68K_DO_LOG_EMU((M68K_LOG_FILEHANDLE "%s at %08x: called 1111 instruction %04x (%s)\n",
+   M68K_DO_LOG_EMU((M68K_LOG_FILEHANDLE "%s at %08X: called 1111 instruction %04X (%s)\n",
                 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PPC), REG_IR,
                 m68ki_disassemble_quick(ADDRESS_68K(REG_PPC))));
 #endif
@@ -1801,7 +1801,7 @@ static inline void m68ki_exception_illegal(void)
 {
    uint sr;
 
-   M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: illegal instruction %04x (%s)\n",
+   M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08X: illegal instruction %04X (%s)\n",
              m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PPC), REG_IR,
              m68ki_disassemble_quick(ADDRESS_68K(REG_PPC))));
 
@@ -1895,7 +1895,7 @@ void m68ki_exception_interrupt(uint int_level)
       vector = EXCEPTION_SPURIOUS_INTERRUPT;
    else if(vector > 255)
    {
-      M68K_DO_LOG_EMU((M68K_LOG_FILEHANDLE "%s at %08x: Interrupt acknowledge returned invalid vector $%x\n",
+      M68K_DO_LOG_EMU((M68K_LOG_FILEHANDLE "%s at %08X: Interrupt acknowledge returned invalid vector $%x\n",
              m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC), vector));
       return;
    }

include/m68k/m68kexternal.h

@@ -6,6 +6,5 @@
 int32_t interruptAcknowledge(int32_t intLevel);
 void emulatorSoftReset(void);
 void flx68000PcLongJump(uint32_t newPc);
-void sandboxOnOpcodeRun(void);
 
 #endif

include/portability.h

@@ -1,8 +1,10 @@
 #ifndef PORTABILITY_H
 #define PORTABILITY_H
 
+#include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include <limits.h>
 
 //threads
 #if defined(EMU_MULTITHREADED)
@@ -25,6 +27,15 @@
 #define likely_equal(x, y) x
 #endif
 
+// PS2 is lacking intmax_t and uintmax_t!
+#if !defined(UINTMAX_MAX)
+	typedef intmax_t signed long long int;
+	typedef uintmax_t unsigned long long int;
+
+	#define INTMAX_MAX LONG_LONG_MAX
+	#define UINTMAX_MAX ULONG_LONG_MAX
+#endif
+
 //endian
 #define SWAP_16(x) ((uint16_t)((((uint16_t)(x) & 0x00FF) << 8) | (((uint16_t)(x) & 0xFF00) >> 8)))
 #define SWAP_32(x) ((uint32_t)((((uint32_t)(x) & 0x000000FF) << 24) | (((uint32_t)(x) & 0x0000FF00) <<  8) | (((uint32_t)(x) & 0x00FF0000) >>  8) | (((uint32_t)(x) & 0xFF000000) >> 24)))

include/pxa260/pxa260.h

@@ -11,6 +11,13 @@
 #include "pxa260_PwrClk.h"
 #include "pxa260_GPIO.h"
 #include "pxa260_TIMR.h"
+#if !defined(EMU_NO_SAFETY)
+#include "../armv5te/uArm/CPU_2.h"
+#endif
+
+#if !defined(EMU_NO_SAFETY)
+extern ArmCpu       pxa260CpuState;
+#endif
 
 extern uint16_t*    pxa260Framebuffer;
 extern Pxa260pwrClk pxa260PwrClk;

include/pxa260/pxa260Accessors.c.h

@@ -1,3 +1,5 @@
+#include "../w86l488.h"
+
 static uint8_t pxa260_io_read_byte(uint32_t addr){
    debugLog("Invalid 8 bit PXA260 register read:0x%08X, PC:0x%08X\n", addr, pxa260GetPc());
    return 0x00;
@@ -120,57 +122,57 @@ static void pxa260_lcd_write_word(uint32_t addr, uint32_t value){
 }
 
 static uint8_t pxa260_pcmcia0_read_byte(uint32_t addr){
-   debugLog("PCMCIA0 8 bit read:0x%08X\n", addr);
+   debugLog("PCMCIA0 8 bit read:0x%08X, PC:0x%08X\n", addr, pxa260GetPc());
    return 0x00;
 }
 
 static uint16_t pxa260_pcmcia0_read_half(uint32_t addr){
-   debugLog("PCMCIA0 16 bit read:0x%08X\n", addr);
+   debugLog("PCMCIA0 16 bit read:0x%08X, PC:0x%08X\n", addr, pxa260GetPc());
    return 0x0000;
 }
 
 static uint32_t pxa260_pcmcia0_read_word(uint32_t addr){
-   debugLog("PCMCIA0 32 bit read:0x%08X\n", addr);
+   debugLog("PCMCIA0 32 bit read:0x%08X, PC:0x%08X\n", addr, pxa260GetPc());
    return 0x00000000;
 }
 
 static void pxa260_pcmcia0_write_byte(uint32_t addr, uint8_t value){
-   debugLog("PCMCIA0 8 bit write:0x%08X, value:0x%02X\n", addr, value);
+   debugLog("PCMCIA0 8 bit write:0x%08X, value:0x%02X, PC:0x%08X\n", addr, value, pxa260GetPc());
 }
 
 static void pxa260_pcmcia0_write_half(uint32_t addr, uint16_t value){
-   debugLog("PCMCIA0 16 bit write:0x%08X, value:0x%04X\n", addr, value);
+   debugLog("PCMCIA0 16 bit write:0x%08X, value:0x%04X, PC:0x%08X\n", addr, value, pxa260GetPc());
 }
 
 static void pxa260_pcmcia0_write_word(uint32_t addr, uint32_t value){
-   debugLog("PCMCIA0 32 bit write:0x%08X, value:0x%08X\n", addr, value);
+   debugLog("PCMCIA0 32 bit write:0x%08X, value:0x%08X, PC:0x%08X\n", addr, value, pxa260GetPc());
 }
 
 static uint8_t pxa260_pcmcia1_read_byte(uint32_t addr){
-   debugLog("PCMCIA1 8 bit read:0x%08X\n", addr);
+   debugLog("PCMCIA1 8 bit read:0x%08X, PC:0x%08X\n", addr, pxa260GetPc());
    return 0x00;
 }
 
 static uint16_t pxa260_pcmcia1_read_half(uint32_t addr){
-   debugLog("PCMCIA1 16 bit read:0x%08X\n", addr);
+   debugLog("PCMCIA1 16 bit read:0x%08X, PC:0x%08X\n", addr, pxa260GetPc());
    return 0x0000;
 }
 
 static uint32_t pxa260_pcmcia1_read_word(uint32_t addr){
-   debugLog("PCMCIA1 32 bit read:0x%08X\n", addr);
+   debugLog("PCMCIA1 32 bit read:0x%08X, PC:0x%08X\n", addr, pxa260GetPc());
    return 0x00000000;
 }
 
 static void pxa260_pcmcia1_write_byte(uint32_t addr, uint8_t value){
-   debugLog("PCMCIA1 8 bit write:0x%08X, value:0x%02X\n", addr, value);
+   debugLog("PCMCIA1 8 bit write:0x%08X, value:0x%02X, PC:0x%08X\n", addr, value, pxa260GetPc());
 }
 
 static void pxa260_pcmcia1_write_half(uint32_t addr, uint16_t value){
-   debugLog("PCMCIA1 16 bit write:0x%08X, value:0x%04X\n", addr, value);
+   debugLog("PCMCIA1 16 bit write:0x%08X, value:0x%04X, PC:0x%08X\n", addr, value, pxa260GetPc());
 }
 
 static void pxa260_pcmcia1_write_word(uint32_t addr, uint32_t value){
-   debugLog("PCMCIA1 32 bit write:0x%08X, value:0x%08X\n", addr, value);
+   debugLog("PCMCIA1 32 bit write:0x%08X, value:0x%08X, PC:0x%08X\n", addr, value, pxa260GetPc());
 }
 
 static uint16_t pxa260_static_chip_select_2_read_half(uint32_t addr){

include/pxa260/pxa260_CPU.h

@@ -0,0 +1,19 @@
+#ifndef PXA260_CPU_H
+#define PXA260_CPU_H
+
+#include "pxa260_types.h"
+
+#if defined(EMU_NO_SAFETY)
+#include "../armv5te/emu.h"
+#include "../armv5te/cpu.h"
+
+#define cpuGetRegExternal(x, regNum) reg_pc(regNum)
+#define cpuSetReg(x, regNum, value) set_reg(regNum, value)
+
+#define cpuIrq(x, fiq, raise) (raise ? (cpu_events |= (fiq ? EVENT_FIQ : EVENT_IRQ)) : (cpu_events &= (fiq ? ~EVENT_FIQ : ~EVENT_IRQ)))
+#else
+#include "../armv5te/uArm/CPU_2.h"
+#endif
+
+#endif
+

include/pxa260/pxa260_DMA.h

@@ -1,5 +1,5 @@
-#ifndef _PXA260_DMA_H_
-#define _PXA260_DMA_H_
+#ifndef PXA260_DMA_H
+#define PXA260_DMA_H
 
 #include "pxa260_CPU.h"
 #include "pxa260_IC.h"

include/pxa260/pxa260_DSP.h

@@ -1,5 +1,5 @@
-#ifndef _PXA260_DSP_H_
-#define _PXA260_DSP_H_
+#ifndef PXA260_DSP_H
+#define PXA260_DSP_H
 
 #include "pxa260_types.h"
 

include/pxa260/pxa260_GPIO.h

@@ -1,5 +1,5 @@
-#ifndef _PXA260_GPIO_H_
-#define _PXA260_GPIO_H_
+#ifndef PXA260_GPIO_H
+#define PXA260_GPIO_H
 
 #include "pxa260_CPU.h"
 #include "pxa260_IC.h"

include/pxa260/pxa260_IC.h

@@ -1,5 +1,5 @@
-#ifndef _PXA260_IC_H_
-#define _PXA260_IC_H_
+#ifndef PXA260_IC_H
+#define PXA260_IC_H
 
 #include "pxa260_CPU.h"
 #include <stdio.h> 

include/pxa260/pxa260_LCD.h

@@ -1,10 +1,10 @@
-#ifndef _PXA260_LCD_H_
-#define _PXA260_LCD_H_
+#ifndef PXA260_LCD_H
+#define PXA260_LCD_H
 
 #include "pxa260_CPU.h"
 #include "pxa260_IC.h"
 
-uint16_t* pxa260Framebuffer;
+extern uint16_t* pxa260Framebuffer;
 
 /*
 	PXA260 OS LCD controller

include/pxa260/pxa260_PwrClk.h

@@ -1,5 +1,5 @@
-#ifndef _PXA260_PWR_CLK_H_
-#define _PXA260_PWR_CLK_H_
+#ifndef PXA260_PWR_CLK_H
+#define PXA260_PWR_CLK_H
 
 #include "pxa260_CPU.h"
 

include/pxa260/pxa260_RTC.h

@@ -1,5 +1,5 @@
-#ifndef _PXA260_RTC_H_
-#define _PXA260_RTC_H_
+#ifndef PXA260_RTC_H
+#define PXA260_RTC_H
 
 #include "pxa260_CPU.h"
 #include "pxa260_IC.h"

include/pxa260/pxa260_TIMR.h

@@ -1,5 +1,5 @@
-#ifndef _PXA260_TIMR_H_
-#define _PXA260_TIMR_H_
+#ifndef PXA260_TIMR_H
+#define PXA260_TIMR_H
 
 #include "pxa260_CPU.h"
 #include "pxa260_IC.h"

include/pxa260/pxa260_UART.h

@@ -1,5 +1,5 @@
-#ifndef _PXA260_UART_H_
-#define _PXA260_UART_H_
+#ifndef PXA260_UART_H
+#define PXA260_UART_H
 
 #include "pxa260_CPU.h"
 #include "pxa260_IC.h"

include/pxa260/pxa260_types.h

@@ -22,6 +22,11 @@ typedef uint8_t Boolean;//must use uint8_t, some functions store extra info in t
 #define _INLINE_ inline
 #define _UNUSED_
 
+#define TYPE_CHECK ((sizeof(UInt32) == 4) && (sizeof(UInt16) == 2) && (sizeof(UInt8) == 1))
+
+#define errNone		0x00
+#define errInternal	0x01
+
 /* runtime stuffs */
 #define err_str(str) debugLog(str)
 #define err_hex(num) debugLog("0x%X", num)

include/sed1376.h

@@ -5,6 +5,8 @@
 #include <stdbool.h>
 
 extern uint16_t* sed1376Framebuffer;
+extern uint16_t  sed1376FramebufferWidth;
+extern uint16_t  sed1376FramebufferHeight;
 extern uint8_t   sed1376Ram[];
 
 void sed1376Reset(void);
@@ -17,5 +19,6 @@ uint8_t sed1376GetRegister(uint8_t address);
 void sed1376SetRegister(uint8_t address, uint8_t value);
 
 void sed1376Render(void);
+void sed1376UpdateLcdStatus(void);
 
 #endif

include/sed1376Accessors.c.h

@@ -121,9 +121,3 @@ static void selectRenderer(bool color, uint8_t bpp){
       }
    }
 }
-
-//updaters
-static void updateLcdStatus(void){
-   palmMisc.lcdOn = !!(sed1376Registers[GPIO_CONT_0] & sed1376Registers[GPIO_CONF_0] & 0x20);
-   palmMisc.backlightLevel = !!(sed1376Registers[GPIO_CONT_0] & sed1376Registers[GPIO_CONF_0] & 0x10) ? (50 + m515BacklightAmplifierState() * 50) : 0;
-}

libretroBuildSystem/CMakeLists.txt

@@ -0,0 +1,45 @@
+add_library(mu_libretro SHARED
+	libretro.c
+	cursors.c
+	miniz.c
+	libretro-common/compat/compat_strl.c
+	libretro-common/compat/compat_posix_string.c
+	libretro-common/compat/fopen_utf8.c
+	libretro-common/encodings/encoding_utf.c
+	libretro-common/memmap/memmap.c
+	libretro-common/streams/file_stream.c
+	libretro-common/string/stdstring.c
+	libretro-common/vfs/vfs_implementation.c)
+
+# Remove the "lib" prefix always, RetroArch does not name in this way
+set_target_properties(mu_libretro PROPERTIES PREFIX "")
+
+# Bring all the sub-modules as needed
+target_link_libraries(mu_libretro
+	MuCore)
+
+# Include the required includes
+target_include_directories(mu_libretro PUBLIC
+	"${PROJECT_SOURCE_DIR}/include"
+	"libretro-common/include")
+
+# Custom launching the core, tries to find RetroArch on the system
+## Determine RetroArch directory
+if(CMAKE_SYSTEM_NAME STREQUAL Windows)
+	set(MU_LIBRETRO_EXTENSION ".exe")
+
+	if (EXISTS "$ENV{APPDATA}/RetroArch")
+		set(MU_LIBRETRO_DIR "$ENV{APPDATA}/RetroArch")
+	endif()
+else()
+	set(MU_LIBRETRO_EXTENSION "")
+endif()
+
+## Target to run RetroArch with the Mu Core
+if(DEFINED MU_LIBRETRO_DIR)
+	add_custom_target(RetroArch
+		DEPENDS mu_libretro
+		COMMAND "${MU_LIBRETRO_DIR}/retroarch${MU_LIBRETRO_EXTENSION}" "-v" "-L" "$<TARGET_FILE:mu_libretro>"
+		WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
+		COMMENT "Starting RetroArch with Mu")
+endif()

libretroBuildSystem/Makefile.libretro

@@ -127,13 +127,28 @@ ifeq ($(arch),ppc)
 		CFLAGS += -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1
 endif
 	OSXVER = $(shell sw_vers -productVersion | cut -d. -f 2)
+	OSX_LT_MAVERICKS = $(shell (( $(OSXVER) <= 9)) && echo "YES")
 	OSX_GT_MOJAVE = $(shell (( $(OSXVER) >= 14)) && echo "YES")
-ifneq ($(OSX_GT_MOJAVE),YES)
-	#this breaks compiling on Mac OS Mojave
-	fpic += -mmacosx-version-min=10.1
-endif
+
+    ifeq ($(OSX_LT_MAVERICKS),"YES")
+        fpic += -mmacosx-version-min=10.5
+    else
+        ifneq ($(OSX_GT_MOJAVE),YES)
+            #this breaks compiling on Mac OS Mojave
+            fpic += -mmacosx-version-min=10.1
+        endif
+    endif
+
 	SHARED := -dynamiclib
 
+    ifeq ($(CROSS_COMPILE),1)
+        TARGET_RULE   = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT)
+        CFLAGS   += $(TARGET_RULE)
+        CPPFLAGS += $(TARGET_RULE)
+        CXXFLAGS += $(TARGET_RULE)
+        LDFLAGS  += $(TARGET_RULE)
+    endif
+
 # iOS
 else ifneq (,$(findstring ios,$(platform)))
 	EXT    ?= dylib
@@ -193,33 +208,15 @@ else ifeq ($(platform), qnx)
 	AR = qcc -Vgcc_ntoarmv7le
 	CFLAGS += -D__BLACKBERRY_QNX__
 
-# PS3
-else ifeq ($(platform), ps3)
-	EXT = a
-	TARGET := $(TARGET_NAME)_libretro_ps3.$(EXT)
-	CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
-	AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
-	CFLAGS += -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1
-	STATIC_LINKING = 1
-	STATIC_LINKING_LINK = 1
-
-# PS3 (SNC)
-else ifeq ($(platform), sncps3)
-	EXT = a
-	TARGET := $(TARGET_NAME)_libretro_ps3.$(EXT)
-	CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
-	AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
-	CFLAGS += -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1
-	STATIC_LINKING = 1
-	STATIC_LINKING_LINK = 1
-
 # Lightweight PS3 Homebrew SDK
-else ifeq ($(platform), psl1ght)
-	EXT = a
-	TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
-	CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
-	AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
-	CFLAGS += -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1
+else ifneq (,$(filter $(platform), ps3 psl1ght))
+	TARGET := $(TARGET_NAME)_libretro_$(platform).a
+	CC = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)gcc$(EXE_EXT)
+	AR = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)ar$(EXE_EXT)
+	ifeq ($(platform), psl1ght)
+		CFLAGS += -D__PSL1GHT__
+	endif
+	CFLAGS += -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1 -D__PS3__
 	STATIC_LINKING = 1
 	STATIC_LINKING_LINK = 1
 
@@ -451,6 +448,16 @@ else ifeq ($(platform), xbox1_msvc2003)
 	STATIC_LINKING = 1
 	STATIC_LINKING_LINK = 1
 
+# PlayStation 2
+else ifeq ($(platform), ps2)
+	TARGET := $(TARGET_NAME)_libretro_$(platform).a
+	CC = mips64r5900el-ps2-elf-gcc$(EXE_EXT)
+	CXX = mips64r5900el-ps2-elf-g++$(EXE_EXT)
+	AR = mips64r5900el-ps2-elf-ar$(EXE_EXT)
+	CFLAGS += -Wall -DPS2 -DABGR1555 
+	STATIC_LINKING = 1
+	STATIC_LINKING_LINK = 1
+
 # Windows
 else
 	EXT    ?= dll

libretroBuildSystem/build/Makefile.common

@@ -5,12 +5,12 @@ COREDEFINES :=
 # my first make function!!!
 CHECK_ALL = $(strip $(foreach v,$(2),$(if $(findstring $(v),$(1)),$(v),)))
 
-INCFLAGS := -I$(LIBRETRO_COMM_DIR)/include
+INCFLAGS := -I$(CORE_DIR)/../include -I$(LIBRETRO_COMM_DIR)/include
 
 ifeq ($(DEBUG), 1)
-	COREDEFINES += -DEMU_DEBUG -DEMU_SANDBOX
+	COREDEFINES += -DEMU_DEBUG
 else
-	COREDEFINES += -DEMU_NO_SAFETY
+	EMU_NO_SAFETY := 1
 endif
 
 # "unix" or "win" is not specific enough, need to know the CPU arch too
@@ -109,6 +109,7 @@ COREDEFINES += $(EMU_DEFINES)
 
 SOURCES_C := $(CORE_DIR)/libretro.c \
 	$(CORE_DIR)/cursors.c \
+	$(CORE_DIR)/miniz.c \
 	$(EMU_SOURCES_C)
 SOURCES_CXX := $(EMU_SOURCES_CXX)
 SOURCES_ASM := $(EMU_SOURCES_ASM)
@@ -123,3 +124,6 @@ ifneq ($(STATIC_LINKING), 1)
 		$(LIBRETRO_COMM_DIR)/string/stdstring.c \
 		$(LIBRETRO_COMM_DIR)/vfs/vfs_implementation.c
 endif
+
+# Make sure C++ shares our include flags!
+CXXFLAGS += $(INCFLAGS)

libretroBuildSystem/build/Makefile.windows_msvc2003_x86

@@ -53,9 +53,8 @@ SOEXT  = .dll
 # Platform setup
 
 STATIC_LINKING = 0
-platform       = win
 PLATDEFS       = 
-PLATCFLAGS     = -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 -DWIN32 -DCORRECT_VRAM_READS -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
+PLATCFLAGS     = -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 -DWIN32 -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
 PLATCXXFLAGS   = $(PLATCFLAGS)
 #PLATLDFLAGS   = -shared -lm
 #PLATLDXFLAGS   = -shared -lm
@@ -82,13 +81,17 @@ LDXFLAGS = $(PLATLDXFLAGS) $(RETROLDXFLAGS)
 # Tuning
 
 ifeq ($(DEBUG),1)
-  CFLAGS   += -Od -Zi -D_DEBUG
-  CXXFLAGS += -Od -Zi -D_DEBUG
-  LDFLAGS  += -DEBUG -DLL
+  CFLAGS     += -Od -Zi -D_DEBUG
+  CXXFLAGS   += -Od -Zi -D_DEBUG
+  CFLAGS     += -MTd
+  CXXFLAGS   += -MTd
+  LDFLAGS    += -DEBUG -DLL
 else
-  CFLAGS   += -O2 -DNDEBUG
-  CXXFLAGS += -O2 -DNDEBUG
-  LDFLAGS  += -DLL
+  CFLAGS     += -O2 -DNDEBUG
+  CXXFLAGS   += -O2 -DNDEBUG
+  CFLAGS     += -MT
+  CXXFLAGS   += -MT
+  LDFLAGS    += -DLL
 endif
 
 ifneq ($(LOG_PERFORMANCE),)

libretroBuildSystem/build/Makefile.windows_msvc2005_x86

@@ -37,10 +37,17 @@ PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../IDE")
 INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/include")
 LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/lib")
 
-WindowsSdkDir := $(INETSDK)
+WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\MicrosoftSDK\InstalledSDKs\8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3" -v "Install Dir" | grep -o '[A-Z]:\\.*')
 
-export INCLUDE := $(INCLUDE);$(WindowsSdkDir)/Include;libretro/msvc/msvc-2005
-export LIB := $(LIB);$(WindowsSdkDir);$(INETSDK)/Lib
+WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include")
+WindowsSDKAtlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\atl")
+WindowsSDKCrtIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\crt")
+WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl")
+WindowsSDKMfcIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\mfc")
+WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib")
+
+export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKAtlIncludeDir);$(WindowsSDKCrtIncludeDir);$(WindowsSDKGlIncludeDir);$(WindowsSDKMfcIncludeDir);libretro-common/include/compat/msvc
+export LIB := $(LIB);$(WindowsSDKLibDir)
 
 ############
 # Extensions
@@ -52,9 +59,8 @@ SOEXT  = .dll
 # Platform setup
 
 STATIC_LINKING = 0
-platform       = win
 PLATDEFS       = 
-PLATCFLAGS     = -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 -DWIN32 -DCORRECT_VRAM_READS -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
+PLATCFLAGS     = -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 -DWIN32 -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
 PLATCXXFLAGS   = $(PLATCFLAGS)
 #PLATLDFLAGS   = -shared -lm
 #PLATLDXFLAGS   = -shared -lm
@@ -81,13 +87,17 @@ LDXFLAGS = $(PLATLDXFLAGS) $(RETROLDXFLAGS)
 # Tuning
 
 ifeq ($(DEBUG),1)
-  CFLAGS   += -Od -Zi -D_DEBUG
-  CXXFLAGS += -Od -Zi -D_DEBUG
-  LDFLAGS  += -DEBUG -DLL
+  CFLAGS     += -Od -Zi -D_DEBUG
+  CXXFLAGS   += -Od -Zi -D_DEBUG
+  CFLAGS     += -MTd
+  CXXFLAGS   += -MTd
+  LDFLAGS    += -DEBUG -DLL
 else
-  CFLAGS   += -O2 -DNDEBUG
-  CXXFLAGS += -O2 -DNDEBUG
-  LDFLAGS  += -DLL
+  CFLAGS     += -O2 -DNDEBUG
+  CXXFLAGS   += -O2 -DNDEBUG
+  CFLAGS     += -MT
+  CXXFLAGS   += -MT
+  LDFLAGS    += -DLL
 endif
 
 ifneq ($(LOG_PERFORMANCE),)

libretroBuildSystem/build/Makefile.windows_msvc2008_x86

@@ -52,9 +52,8 @@ SOEXT  = .dll
 # Platform setup
 
 STATIC_LINKING = 0
-platform       = win
 PLATDEFS       = 
-PLATCFLAGS     = -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 -DWIN32 -DCORRECT_VRAM_READS -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
+PLATCFLAGS     = -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 -DWIN32 -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
 PLATCXXFLAGS   = $(PLATCFLAGS)
 #PLATLDFLAGS   = -shared -lm
 #PLATLDXFLAGS   = -shared -lm
@@ -81,13 +80,17 @@ LDXFLAGS = $(PLATLDXFLAGS) $(RETROLDXFLAGS)
 # Tuning
 
 ifeq ($(DEBUG),1)
-  CFLAGS   += -Od -Zi -D_DEBUG
-  CXXFLAGS += -Od -Zi -D_DEBUG
-  LDFLAGS  += -DEBUG -DLL
+  CFLAGS     += -Od -Zi -D_DEBUG
+  CXXFLAGS   += -Od -Zi -D_DEBUG
+  CFLAGS     += -MTd
+  CXXFLAGS   += -MTd
+  LDFLAGS    += -DEBUG -DLL
 else
-  CFLAGS   += -O2 -DNDEBUG
-  CXXFLAGS += -O2 -DNDEBUG
-  LDFLAGS  += -DLL
+  CFLAGS     += -O2 -DNDEBUG
+  CXXFLAGS   += -O2 -DNDEBUG
+  CFLAGS     += -MT
+  CXXFLAGS   += -MT
+  LDFLAGS    += -DLL
 endif
 
 ifneq ($(LOG_PERFORMANCE),)

libretroBuildSystem/build/Makefile.windows_msvc2010_x64

@@ -37,11 +37,16 @@ PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../IDE")
 INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include")
 LIB := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/lib/amd64")
 
-WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
-WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
+WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
+WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
 
-export INCLUDE := $(INCLUDE);$(WindowsSdkDir)Include
-export LIB := $(LIB);$(WindowsSdkDir)Lib/x64
+WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include")
+WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl")
+WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib\x64")
+
+INCFLAGS_PLATFORM = -I"$(WindowsSdkDirInc)"
+export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKGlIncludeDir)
+export LIB := $(LIB);$(WindowsSDKLibDir)
 
 ############
 # Extensions
@@ -53,9 +58,8 @@ SOEXT  = .dll
 # Platform setup
 
 STATIC_LINKING = 0
-platform       = win
 PLATDEFS       = 
-PLATCFLAGS     = -DWIN32 -DCORRECT_VRAM_READS -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
+PLATCFLAGS     = -DWIN32 -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
 PLATCXXFLAGS   = $(PLATCFLAGS)
 #PLATLDFLAGS   = -shared -lm
 #PLATLDXFLAGS   = -shared -lm
@@ -82,13 +86,17 @@ LDXFLAGS = $(PLATLDXFLAGS) $(RETROLDXFLAGS)
 # Tuning
 
 ifeq ($(DEBUG),1)
-  CFLAGS   += -Od -Zi -D_DEBUG
-  CXXFLAGS += -Od -Zi -D_DEBUG
-  LDFLAGS  += -DEBUG -DLL
+  CFLAGS     += -Od -Zi -D_DEBUG
+  CXXFLAGS   += -Od -Zi -D_DEBUG
+  CFLAGS     += -MTd
+  CXXFLAGS   += -MTd
+  LDFLAGS    += -DEBUG -DLL
 else
-  CFLAGS   += -O2 -DNDEBUG
-  CXXFLAGS += -O2 -DNDEBUG
-  LDFLAGS  += -DLL
+  CFLAGS     += -O2 -DNDEBUG
+  CXXFLAGS   += -O2 -DNDEBUG
+  CFLAGS     += -MT
+  CXXFLAGS   += -MT
+  LDFLAGS    += -DLL
 endif
 
 ifneq ($(LOG_PERFORMANCE),)

libretroBuildSystem/build/Makefile.windows_msvc2010_x86

@@ -37,11 +37,16 @@ PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../IDE")
 INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include")
 LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS100COMNTOOLS)../../VC/lib")
 
-WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
-WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
+WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
+WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
 
-export INCLUDE := $(INCLUDE);$(WindowsSdkDir)Include
-export LIB := $(LIB);$(WindowsSdkDir)Lib
+WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include")
+WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl")
+WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib")
+
+INCFLAGS_PLATFORM = -I"$(WindowsSdkDirInc)"
+export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKGlIncludeDir)
+export LIB := $(LIB);$(WindowsSDKLibDir)
 
 ############
 # Extensions
@@ -53,9 +58,8 @@ SOEXT  = .dll
 # Platform setup
 
 STATIC_LINKING = 0
-platform       = win
 PLATDEFS       = 
-PLATCFLAGS     = -DWIN32 -DCORRECT_VRAM_READS -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
+PLATCFLAGS     = -DWIN32 -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
 PLATCXXFLAGS   = $(PLATCFLAGS)
 #PLATLDFLAGS   = -shared -lm
 #PLATLDXFLAGS   = -shared -lm
@@ -82,13 +86,17 @@ LDXFLAGS = $(PLATLDXFLAGS) $(RETROLDXFLAGS)
 # Tuning
 
 ifeq ($(DEBUG),1)
-  CFLAGS   += -Od -Zi -D_DEBUG
-  CXXFLAGS += -Od -Zi -D_DEBUG
-  LDFLAGS  += -DEBUG -DLL
+  CFLAGS     += -Od -Zi -D_DEBUG
+  CXXFLAGS   += -Od -Zi -D_DEBUG
+  CFLAGS     += -MTd
+  CXXFLAGS   += -MTd
+  LDFLAGS    += -DEBUG -DLL
 else
-  CFLAGS   += -O2 -DNDEBUG
-  CXXFLAGS += -O2 -DNDEBUG
-  LDFLAGS  += -DLL
+  CFLAGS     += -O2 -DNDEBUG
+  CXXFLAGS   += -O2 -DNDEBUG
+  CFLAGS     += -MT
+  CXXFLAGS   += -MT
+  LDFLAGS    += -DLL
 endif
 
 ifneq ($(LOG_PERFORMANCE),)

libretroBuildSystem/build/Makefile.windows_msvc2015_x64

@@ -61,9 +61,8 @@ SOEXT  = .dll
 # Platform setup
 
 STATIC_LINKING = 0
-platform       = win
 PLATDEFS       = 
-PLATCFLAGS     = -DWIN32 -DCORRECT_VRAM_READS -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
+PLATCFLAGS     = -DWIN32 -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
 PLATCXXFLAGS   = $(PLATCFLAGS)
 #PLATLDFLAGS   = -shared -lm
 #PLATLDXFLAGS   = -shared -lm
@@ -90,13 +89,17 @@ LDXFLAGS = $(PLATLDXFLAGS) $(RETROLDXFLAGS)
 # Tuning
 
 ifeq ($(DEBUG),1)
-  CFLAGS   += -Od -Zi -D_DEBUG
-  CXXFLAGS += -Od -Zi -D_DEBUG
-  LDFLAGS  += -DEBUG -DLL
+  CFLAGS     += -Od -Zi -D_DEBUG
+  CXXFLAGS   += -Od -Zi -D_DEBUG
+  CFLAGS     += -MTd
+  CXXFLAGS   += -MTd
+  LDFLAGS    += -DEBUG -DLL
 else
-  CFLAGS   += -O2 -DNDEBUG
-  CXXFLAGS += -O2 -DNDEBUG
-  LDFLAGS  += -DLL
+  CFLAGS     += -O2 -DNDEBUG
+  CXXFLAGS   += -O2 -DNDEBUG
+  CFLAGS     += -MT
+  CXXFLAGS   += -MT
+  LDFLAGS    += -DLL
 endif
 
 ifneq ($(LOG_PERFORMANCE),)

libretroBuildSystem/jni/Application.mk

@@ -1,5 +1,5 @@
 # only compile the CPUs that Android actually used at some point
-APP_ABI := armeabi armeabi-v7a arm64-v8a x86 x86_64
+APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
 APP_PLATFORM := android-18
 APP_STL := c++_static
 APP_CPPFLAGS += -std=c++11

libretroBuildSystem/libretro-common/include/libretro.h

@@ -69,7 +69,7 @@ extern "C" {
 #      endif
 #    endif
 #  else
-#      if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__CELLOS_LV2__)
+#      if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__PS3__)
 #        define RETRO_API RETRO_CALLCONV __attribute__((__visibility__("default")))
 #      else
 #        define RETRO_API RETRO_CALLCONV

libretroBuildSystem/libretro-common/include/memmap.h

@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#if defined(__CELLOS_LV2__) || defined(PSP) || defined(GEKKO) || defined(VITA) || defined(_XBOX) || defined(_3DS) || defined(WIIU) || defined(SWITCH)
+#if defined(__PS3__) || defined(PSP) || defined(GEKKO) || defined(VITA) || defined(_XBOX) || defined(_3DS) || defined(WIIU) || defined(SWITCH)
 /* No mman available */
 #elif defined(_WIN32) && !defined(_XBOX)
 #include <windows.h>

libretroBuildSystem/libretro-common/include/retro_miscellaneous.h

@@ -39,7 +39,7 @@
 #include <Xtl.h>
 #endif
 
-#if defined(__CELLOS_LV2__)
+#if defined(__PS3__)
 #include <sys/fs_external.h>
 #endif
 
@@ -75,8 +75,8 @@ static INLINE bool bits_any_set(uint32_t* ptr, uint32_t count)
 }
 
 #ifndef PATH_MAX_LENGTH
-#if defined(__CELLOS_LV2__)
-#define PATH_MAX_LENGTH CELL_FS_MAX_FS_PATH_LENGTH
+#if defined(__PS3__)
+#define PATH_MAX_LENGTH 1024
 #elif defined(_XBOX1) || defined(_3DS) || defined(PSP) || defined(GEKKO)|| defined(WIIU)
 #define PATH_MAX_LENGTH 512
 #else

libretroBuildSystem/libretro-common/vfs/vfs_implementation.c

@@ -55,7 +55,7 @@
 #  include <unistd.h>
 #endif
 
-#ifdef __CELLOS_LV2__
+#ifdef __PS3__
 #include <cell/cell_fs.h>
 #define O_RDONLY CELL_FS_O_RDONLY
 #define O_WRONLY CELL_FS_O_WRONLY
@@ -123,7 +123,7 @@ int64_t retro_vfs_file_seek_internal(libretro_vfs_implementation_file *stream, i
 /* VC2005 and up have a special 64-bit fseek */
 #ifdef ATLEAST_VC2005
       return _fseeki64(stream->fp, offset, whence);
-#elif defined(__CELLOS_LV2__) || defined(_MSC_VER) && _MSC_VER <= 1310
+#elif defined(__PS3__) || defined(_MSC_VER) && _MSC_VER <= 1310
       return fseek(stream->fp, (long)offset, whence);
 #else
       return fseeko(stream->fp, (off_t)offset, whence);

libretroBuildSystem/libretro.c

@@ -13,12 +13,12 @@
 #include <streams/file_stream.h>
 #include <string/stdstring.h>
 
-#include "../src/emulator.h"
-#include "../src/portability.h"
-#include "../src/silkscreen.h"
-#include "../src/fileLauncher/launcher.h"
+#include "emulator.h"
+#include "portability.h"
+#include "silkscreen.h"
+#include "fileLauncher/launcher.h"
 #include "cursors.h"
-
+#include "miniz.h"
 
 #define JOYSTICK_DEADZONE 4000
 #define JOYSTICK_MULTIPLIER 0.0001
@@ -33,21 +33,20 @@ static retro_environment_t        environ_cb = NULL;
 static retro_input_poll_t         input_poll_cb = NULL;
 static retro_input_state_t        input_state_cb = NULL;
 
-static double   cpuSpeed;
-static bool     syncRtc;
-static bool     allowInvalidBehavior;
-#if defined(EMU_SUPPORT_PALM_OS5)
-static bool     useOs5;
-#endif
-static bool     firstRetroRunCall;
-static bool     dontRenderGraffiti;
-static bool     useJoystickAsMouse;
-static float    touchCursorX;
-static float    touchCursorY;
-static char     contentPath[PATH_MAX_LENGTH];
-static uint16_t mouseCursorOldArea[32 * 32];
-static bool     runningImgFile;
-static uint16_t screenYEnd;
+static double      cpuSpeed;
+static bool        syncRtc;
+static bool        allowInvalidBehavior;
+static const char* osVersion;
+static uint8_t     deviceModel;
+static bool        firstRetroRunCall;
+static bool        dontRenderGraffiti;
+static bool        useJoystickAsMouse;
+static float       touchCursorX;
+static float       touchCursorY;
+static char        contentPath[PATH_MAX_LENGTH];
+static uint16_t    mouseCursorOldArea[32 * 32];
+static bool        runningImgFile;
+static uint16_t    screenYEnd;
 
 
 static void frontendGetCurrentTime(uint8_t* writeBack){
@@ -161,11 +160,31 @@ static void check_variables(bool booting){
    if(environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
       dontRenderGraffiti = !strcmp(var.value, "enabled");
    
+   var.key = "palm_emu_os_version";
+   if(environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value){
+      if(!strcmp(var.value, "Palm m500/Palm OS 4.0")){
+         deviceModel = EMU_DEVICE_PALM_M500;
+         osVersion = "palmos40-en-m500";
+      }
+      else if(!strcmp(var.value, "Palm m515/Palm OS 4.1")){
+         deviceModel = EMU_DEVICE_PALM_M515;
+         osVersion = "palmos41-en-m515";
+      }
 #if defined(EMU_SUPPORT_PALM_OS5)
-   var.key = "palm_emu_use_os5";
-   if(environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
-      useOs5 = !strcmp(var.value, "enabled");
+      else if(!strcmp(var.value, "Tungsten T3/Palm OS 5.2.1")){
+         deviceModel = EMU_DEVICE_TUNGSTEN_T3;
+         osVersion = "palmos52-en-t3";
+      }
+      else if(!strcmp(var.value, "Tungsten T3/Palm OS 6.0")){
+         deviceModel = EMU_DEVICE_TUNGSTEN_T3;
+         osVersion = "palmos60-en-t3";
+      }
 #endif
+      else{
+         deviceModel = EMU_DEVICE_PALM_M515;
+         osVersion = "palmos41-en-m515";
+      }
+   }
 }
 
 void retro_init(void){
@@ -194,9 +213,13 @@ void retro_get_system_info(struct retro_system_info *info){
 #ifndef GIT_VERSION
 #define GIT_VERSION ""
 #endif
-   info->library_version  = "v1.1.0" GIT_VERSION;
+   info->library_version  = "v1.3.1" GIT_VERSION;
    info->need_fullpath    = true;
-   info->valid_extensions = "prc|pqa|img";
+   info->valid_extensions = "prc|pqa|img|pdb|zip";
+
+   // Prevent RetroArch from looking within ZIP files, so we can grab all
+   // the PRCs and PDBs accordingly as a single group
+   info->block_extract = true;
 }
 
 void retro_get_system_av_info(struct retro_system_av_info *info){
@@ -226,7 +249,9 @@ void retro_set_environment(retro_environment_t cb){
       { "palm_emu_use_joystick_as_mouse", "Use Left Joystick As Mouse; disabled|enabled" },
       { "palm_emu_disable_graffiti", "Disable Graffiti Area; disabled|enabled" },
 #if defined(EMU_SUPPORT_PALM_OS5)
-      { "palm_emu_use_os5", "Boot Apps In OS 5(DEV ONLY); disabled|enabled" },
+      { "palm_emu_os_version", "OS Version; Palm m515/Palm OS 4.1|Tungsten T3/Palm OS 5.2.1|Tungsten T3/Palm OS 6.0|Palm m500/Palm OS 4.0" },
+#else
+      { "palm_emu_os_version", "OS Version; Palm m515/Palm OS 4.1|Palm m500/Palm OS 4.0" },
 #endif
       { 0 }
    };
@@ -302,7 +327,7 @@ void retro_run(void){
    if(unlikely(firstRetroRunCall)){
       struct retro_game_geometry geometry;
 #if defined(EMU_SUPPORT_PALM_OS5)
-      if(useOs5){
+      if(deviceModel == EMU_DEVICE_TUNGSTEN_T3){
          if(dontRenderGraffiti){
             geometry.base_width   = 320;
             geometry.base_height  = 320;
@@ -368,7 +393,7 @@ void retro_run(void){
    palmInput.buttonUp = input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP);
    palmInput.buttonDown = input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN);
 #if defined(EMU_SUPPORT_PALM_OS5)
-   if(useOs5){
+   if(deviceModel == EMU_DEVICE_TUNGSTEN_T3){
       palmInput.buttonLeft = input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT);
       palmInput.buttonRight = input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT);
       palmInput.buttonCenter = input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT);
@@ -405,6 +430,198 @@ void retro_run(void){
       unrenderMouseCursor(touchCursorX, touchCursorY);
 }
 
+/**
+ * Tries to load a non-SRAM based content file, it will be installed into the
+ * system. This will handle the case where the content is a ZIP file in which
+ * if it is then it will load all of the contained PRCs and PDBs accordingly.
+ *
+ * @param error The error possibly.
+ * @param contentData The data being loaded.
+ * @param contentSize The size of the loaded content.
+ * @since 2022/10/02
+ */
+bool loadContentFileNonSRAM(uint32_t *error, uint8_t *contentData,
+							uint32_t contentSize) {
+	mz_zip_archive zipArchive;
+	mz_zip_archive_file_stat stat;
+	uint32_t appId = 0, maybeAppId, newError;
+	uint32_t numFiles, index, lookStage;
+	uint32_t fileNameLen;
+	void* entryBuf;
+
+	// Detect if this is a ZIP file, if it is
+	memset(&zipArchive, 0, sizeof(zipArchive));
+	if (mz_zip_reader_init_mem(&zipArchive,
+		contentData, contentSize,
+		MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY |
+		MZ_ZIP_FLAG_ASCII_FILENAME))
+	{
+		// Notice
+		log_cb(RETRO_LOG_INFO, "Loading from ZIP...\n");
+
+		// Process every file in the ZIP looking for PDBs, then PRCs
+		numFiles = mz_zip_reader_get_num_files(&zipArchive);
+		for (lookStage = 0; lookStage < 2; lookStage++)
+			for (index = 0; index < numFiles; index++)
+			{
+				// If we are failing then just fail here
+				if ((*error) != EMU_ERROR_NONE)
+				{
+					lookStage = 9999;
+					index = numFiles;
+					break;
+				}
+
+				// Get file information, only care about valid ones
+				memset(&stat, 0, sizeof(stat));
+				if (!mz_zip_reader_file_stat(&zipArchive,
+					index, &stat))
+					continue;
+
+				// Ignore directories and anything MiniZ does not support
+				if (!stat.m_is_supported || stat.m_is_directory)
+					continue;
+
+				// How long is the file name?
+				fileNameLen = strlen(stat.m_filename);
+
+				// Too short?
+				if (fileNameLen < 4)
+					continue;
+
+				// Not a PDB or PRC?
+				if (0 != strcasecmp((lookStage == 0 ? ".pdb" : ".prc"),
+					&stat.m_filename[fileNameLen - 4]))
+					continue;
+
+				// Allocate buffer for the data
+				entryBuf = malloc(stat.m_uncomp_size);
+				if (entryBuf == NULL)
+					return false;
+
+				// Load in data
+				memset(entryBuf, 0, stat.m_uncomp_size);
+				if (mz_zip_reader_extract_to_mem_no_alloc(&zipArchive,
+					index, entryBuf, stat.m_uncomp_size,
+					0, NULL, 0))
+				{
+					// Notice
+					log_cb(RETRO_LOG_INFO, "Installing from ZIP: %s\n",
+						stat.m_filename);
+
+					// Install the file
+					newError = launcherInstallFile(entryBuf,
+							stat.m_uncomp_size);
+
+					// Fill in error state
+					if (newError != EMU_ERROR_NONE)
+						(*error) = newError;
+
+					// If we are loading a PRC, get the appId of it so that we
+					// can launch it accordingly
+					if (lookStage == 1)
+					{
+						maybeAppId = launcherGetAppId(entryBuf,
+							stat.m_uncomp_size);
+						if (maybeAppId != 0)
+							appId = maybeAppId;
+					}
+				}
+
+				// Clear allocated data
+				free(entryBuf);
+			}
+
+		// Stop reading the ZIP
+		mz_zip_end(&zipArchive);
+	}
+
+	// Otherwise, not a ZIP at all... load it directly
+	else
+	{
+		// Notice
+		log_cb(RETRO_LOG_INFO, "Loading single PRC/PDB...\n");
+
+		// Install the file
+		(*error) = launcherInstallFile(contentData, contentSize);
+
+		// Get the app ID to launch
+		appId = launcherGetAppId(contentData, contentSize);
+	}
+
+	// Notice
+	log_cb(RETRO_LOG_INFO, "Completed load!\n");
+
+	// Try to the launch the app, if it even is one...
+	if ((*error) == EMU_ERROR_NONE && appId != 0)
+		(*error) = launcherExecute(appId);
+}
+
+bool loadContentFile(bool hasSram, uint32_t* error) {
+	struct RFILE *contentFile;
+	uint8_t *contentData;
+	uint32_t contentSize;
+
+	contentFile = filestream_open(contentPath, RETRO_VFS_FILE_ACCESS_READ,
+								  RETRO_VFS_FILE_ACCESS_HINT_NONE);
+	if (contentFile) {
+		contentSize = filestream_get_size(contentFile);
+		contentData = malloc(contentSize);
+
+		if (contentData)
+			filestream_read(contentFile, contentData, contentSize);
+		else
+			return false;
+		filestream_close(contentFile);
+	} else {
+		//no content at path, fail time
+		return false;
+	}
+
+	launcherBootInstantly(hasSram);
+
+	if (runningImgFile) {
+		char infoPath[PATH_MAX_LENGTH];
+		struct RFILE *infoFile;
+		uint8_t *infoData = NULL;
+		uint32_t infoSize = 0;
+		sd_card_info_t sdInfo;
+
+		memset(&sdInfo, 0x00, sizeof(sdInfo));
+
+		strlcpy(infoPath, contentPath, PATH_MAX_LENGTH);
+		infoPath[strlen(infoPath) - 4] = '\0';//chop off ".img"
+		strlcat(infoPath, ".info", PATH_MAX_LENGTH);
+		infoFile = filestream_open(infoPath, RETRO_VFS_FILE_ACCESS_READ,
+								   RETRO_VFS_FILE_ACCESS_HINT_NONE);
+		if (infoFile) {
+			infoSize = filestream_get_size(infoFile);
+			infoData = malloc(infoSize);
+
+			if (infoData)
+				filestream_read(infoFile, infoData, infoSize);
+
+			filestream_close(infoFile);
+		}
+
+		if (infoData)
+			launcherGetSdCardInfoFromInfoFile(infoData, infoSize, &sdInfo);
+		(*error) = emulatorInsertSdCard(contentData, contentSize,
+										infoData ? &sdInfo : NULL);
+		if (infoData)
+			free(infoData);
+	} else {
+		if (!hasSram)
+			loadContentFileNonSRAM(error, contentData, contentSize);
+	}
+
+	free(contentData);
+	if ((*error) != EMU_ERROR_NONE)
+		return false;
+
+	return true;
+}
+
 bool retro_load_game(const struct retro_game_info *info){
    uint8_t* romData;
    uint32_t romSize;
@@ -435,7 +652,7 @@ bool retro_load_game(const struct retro_game_info *info){
       runningImgFile = string_is_equal_case_insensitive(contentPath + strlen(contentPath) - 4, ".img");
    }
    else{
-      //boot standard device image, "os5" or "os4" gets appended below
+      //boot standard device image
       strlcpy(contentPath, systemDir, PATH_MAX_LENGTH);
       strlcat(contentPath, "/default", PATH_MAX_LENGTH);
       runningImgFile = false;
@@ -443,12 +660,9 @@ bool retro_load_game(const struct retro_game_info *info){
    
    //ROM
    strlcpy(romPath, systemDir, PATH_MAX_LENGTH);
-#if defined(EMU_SUPPORT_PALM_OS5)
-   if(useOs5)
-      strlcat(romPath, "/palmos52-en-t3.rom", PATH_MAX_LENGTH);
-   else
-#endif
-      strlcat(romPath, "/palmos41-en-m515.rom", PATH_MAX_LENGTH);
+   strlcat(romPath, "/", PATH_MAX_LENGTH);
+   strlcat(romPath, osVersion, PATH_MAX_LENGTH);
+   strlcat(romPath, ".rom", PATH_MAX_LENGTH);
    romFile = filestream_open(romPath, RETRO_VFS_FILE_ACCESS_READ, RETRO_VFS_FILE_ACCESS_HINT_NONE);
    if(romFile){
       romSize = filestream_get_size(romFile);
@@ -465,9 +679,9 @@ bool retro_load_game(const struct retro_game_info *info){
       return false;
    }
    
-   //bootloader, will simple be ignored for Tungsten T3
+   //bootloader, will simply be ignored for Tungsten T3
    strlcpy(bootloaderPath, systemDir, PATH_MAX_LENGTH);
-   strlcat(bootloaderPath, "/bootloader-en-m515.rom", PATH_MAX_LENGTH);
+   strlcat(bootloaderPath, "/bootloader-dbvz.rom", PATH_MAX_LENGTH);
    bootloaderFile = filestream_open(bootloaderPath, RETRO_VFS_FILE_ACCESS_READ, RETRO_VFS_FILE_ACCESS_HINT_NONE);
    if(bootloaderFile){
       bootloaderSize = filestream_get_size(bootloaderFile);
@@ -484,7 +698,7 @@ bool retro_load_game(const struct retro_game_info *info){
       bootloaderSize = 0;
    }
    
-   error = emulatorInit(romData, romSize, bootloaderData, bootloaderSize, syncRtc, allowInvalidBehavior);
+   error = emulatorInit(deviceModel, romData, romSize, bootloaderData, bootloaderSize, syncRtc, allowInvalidBehavior);
    free(romData);
    if(bootloaderData)
       free(bootloaderData);
@@ -494,12 +708,8 @@ bool retro_load_game(const struct retro_game_info *info){
    
    //save RAM
    strlcpy(saveRamPath, contentPath, PATH_MAX_LENGTH);
-#if defined(EMU_SUPPORT_PALM_OS5)
-   if(useOs5)
-      strlcat(saveRamPath, ".os5", PATH_MAX_LENGTH);
-   else
-#endif
-      strlcat(saveRamPath, ".os4", PATH_MAX_LENGTH);
+   strlcat(saveRamPath, "-", PATH_MAX_LENGTH);
+   strlcat(saveRamPath, osVersion, PATH_MAX_LENGTH);
    strlcat(saveRamPath, ".ram", PATH_MAX_LENGTH);
    saveRamFile = filestream_open(saveRamPath, RETRO_VFS_FILE_ACCESS_READ, RETRO_VFS_FILE_ACCESS_HINT_NONE);
    if(saveRamFile){
@@ -514,12 +724,8 @@ bool retro_load_game(const struct retro_game_info *info){
    if(!runningImgFile){
       //SD card
       strlcpy(sdImgPath, contentPath, PATH_MAX_LENGTH);
-#if defined(EMU_SUPPORT_PALM_OS5)
-      if(useOs5)
-         strlcat(sdImgPath, ".os5", PATH_MAX_LENGTH);
-      else
-#endif
-         strlcat(sdImgPath, ".os4", PATH_MAX_LENGTH);
+      strlcat(sdImgPath, "-", PATH_MAX_LENGTH);
+      strlcat(sdImgPath, osVersion, PATH_MAX_LENGTH);
       strlcat(sdImgPath, ".sd.img", PATH_MAX_LENGTH);
       sdImgFile = filestream_open(sdImgPath, RETRO_VFS_FILE_ACCESS_READ, RETRO_VFS_FILE_ACCESS_HINT_NONE);
       if(sdImgFile){
@@ -541,68 +747,10 @@ bool retro_load_game(const struct retro_game_info *info){
    emulatorSetRtc(timeInfo->tm_yday, timeInfo->tm_hour, timeInfo->tm_min, timeInfo->tm_sec);
    
    //see if RetroArch wants something launched
-   if(info && !string_is_empty(info->path)){
-      struct RFILE* contentFile;
-      uint8_t* contentData;
-      uint32_t contentSize;
-      
-      contentFile = filestream_open(contentPath, RETRO_VFS_FILE_ACCESS_READ, RETRO_VFS_FILE_ACCESS_HINT_NONE);
-      if(contentFile){
-         contentSize = filestream_get_size(contentFile);
-         contentData = malloc(contentSize);
-         
-         if(contentData)
-            filestream_read(contentFile, contentData, contentSize);
-         else
-            return false;
-         filestream_close(contentFile);
-      }
-      else{
-         //no content at path, fail time
-         return false;
-      }
-      
-      launcherBootInstantly(hasSram);
-
-      if(runningImgFile){
-         char infoPath[PATH_MAX_LENGTH];
-         struct RFILE* infoFile;
-         uint8_t* infoData = NULL;
-         uint32_t infoSize;
-         sd_card_info_t sdInfo;
-         
-         memset(&sdInfo, 0x00, sizeof(sdInfo));
-         
-         strlcpy(infoPath, contentPath, PATH_MAX_LENGTH);
-         infoPath[strlen(infoPath) - 4] = '\0';//chop off ".img"
-         strlcat(infoPath, ".info", PATH_MAX_LENGTH);
-         infoFile = filestream_open(infoPath, RETRO_VFS_FILE_ACCESS_READ, RETRO_VFS_FILE_ACCESS_HINT_NONE);
-         if(infoFile){
-            infoSize = filestream_get_size(infoFile);
-            infoData = malloc(infoSize);
-            
-            if(infoData)
-               filestream_read(infoFile, infoData, infoSize);
-
-            filestream_close(infoFile);
-         }
-         
-         if(infoData)
-            launcherGetSdCardInfoFromInfoFile(infoData, infoSize, &sdInfo);
-         error = emulatorInsertSdCard(contentData, contentSize, infoData ? &sdInfo : NULL);
-         if(infoData)
-            free(infoData);
-      }
-      else{
-         if(!hasSram)
-            error = launcherInstallFile(contentData, contentSize);
-         if(error == EMU_ERROR_NONE)
-            error = launcherExecute(launcherGetAppId(contentData, contentSize));
-      }
-      
-      free(contentData);
-      if(error != EMU_ERROR_NONE)
-         return false;
+   if(info && !string_is_empty(info->path)) {
+	   if (!loadContentFile(hasSram, &error)) {
+	   		return false;
+	   }
    }
    
    //set the time callback
@@ -615,7 +763,7 @@ bool retro_load_game(const struct retro_game_info *info){
    //make touches land on the correct spot and screen render the correct size when the graffiti area is off
    if(dontRenderGraffiti){
 #if defined(EMU_SUPPORT_PALM_OS5)
-      if(useOs5)
+      if(deviceModel == EMU_DEVICE_TUNGSTEN_T3)
          screenYEnd = 320;
       else
 #endif
@@ -642,12 +790,8 @@ void retro_unload_game(void){
    
    //save RAM
    strlcpy(saveRamPath, contentPath, PATH_MAX_LENGTH);
-#if defined(EMU_SUPPORT_PALM_OS5)
-   if(useOs5)
-      strlcat(saveRamPath, ".os5", PATH_MAX_LENGTH);
-   else
-#endif
-      strlcat(saveRamPath, ".os4", PATH_MAX_LENGTH);
+   strlcat(saveRamPath, "-", PATH_MAX_LENGTH);
+   strlcat(saveRamPath, osVersion, PATH_MAX_LENGTH);
    strlcat(saveRamPath, ".ram", PATH_MAX_LENGTH);
    saveRamFile = filestream_open(saveRamPath, RETRO_VFS_FILE_ACCESS_WRITE, RETRO_VFS_FILE_ACCESS_HINT_NONE);
    if(saveRamFile){
@@ -660,12 +804,8 @@ void retro_unload_game(void){
       //SD card
       if(palmSdCard.flashChipData){
          strlcpy(sdImgPath, contentPath, PATH_MAX_LENGTH);
-#if defined(EMU_SUPPORT_PALM_OS5)
-         if(useOs5)
-            strlcat(sdImgPath, ".os5", PATH_MAX_LENGTH);
-         else
-#endif
-            strlcat(sdImgPath, ".os4", PATH_MAX_LENGTH);
+         strlcat(sdImgPath, "-", PATH_MAX_LENGTH);
+         strlcat(sdImgPath, osVersion, PATH_MAX_LENGTH);
          strlcat(sdImgPath, ".sd.img", PATH_MAX_LENGTH);
          sdImgFile = filestream_open(sdImgPath, RETRO_VFS_FILE_ACCESS_WRITE, RETRO_VFS_FILE_ACCESS_HINT_NONE);
          if(sdImgFile){

libretroBuildSystem/miniz_LICENSE

@@ -0,0 +1,22 @@
+Copyright 2013-2014 RAD Game Tools and Valve Software
+Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
+
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

libretroBuildSystem/mu_libretro.info

@@ -1,21 +1,36 @@
+# Software Information
 display_name = "Palm OS (Mu)"
-authors = "guicrith / meepingsnesroms"
-supported_extensions = "prc|pqa|img"
+authors = "guicrith / meepingsnesroms; Stephanie Gawroriski (Xer Shadow Tail)"
+supported_extensions = "prc|pqa|img|pdb|zip"
 corename = "Mu"
-manufacturer = "Palm"
-categories = "Emulator"
-systemname = "Palm OS"
-license = "Non-commercial"
+license = "CC BY-NC 3.0 US (Non-commercial)"
 permissions = ""
-display_version = "v1.1.0"
+display_version = "v1.3.1"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Palm"
+systemname = "Palm OS"
+
+# Libretro Features
 supports_no_game = "true"
-firmware_count = 3
-firmware0_desc = "palmos41-en-m515.rom (Palm OS 4.1)"
-firmware0_path = "palmos41-en-m515.rom"
+
+# BIOS/Firmware
+firmware_count = 5
+firmware0_desc = "palmos40-en-m500.rom (Palm OS 4.0)"
+firmware0_path = "palmos40-en-m500.rom"
 firmware0_opt = "true"
-firmware1_desc = "palmos52-en-t3.rom (Palm OS 5.2.1)"
-firmware1_path = "palmos52-en-t3.rom"
-firmware1_opt = "true"
-firmware2_desc = "bootloader-en-m515.rom (MC68VZ328 UART Bootloader)"
-firmware2_path = "bootloader-en-m515.rom"
+firmware1_desc = "palmos41-en-m515.rom (Palm OS 4.1)"
+firmware1_path = "palmos41-en-m515.rom"
+firmware1_opt = "false"
+firmware2_desc = "palmos52-en-t3.rom (Palm OS 5.2.1)"
+firmware2_path = "palmos52-en-t3.rom"
 firmware2_opt = "true"
+firmware3_desc = "palmos60-en-t3.rom (Palm OS 6.0)"
+firmware3_path = "palmos60-en-t3.rom"
+firmware3_opt = "true"
+firmware4_desc = "bootloader-dbvz.rom (MC68VZ328 UART Bootloader)"
+firmware4_path = "bootloader-dbvz.rom"
+firmware4_opt = "true"
+
+description = "An emulator for the Palm m515 OS ported to libretro. It is intended to avoid hacks like those used by the POSE emulator, where API calls are intercepted and replaced with those that don't use the actual hardware."

qtBuildSystem/CMakeLists.txt

@@ -0,0 +1,14 @@
+# Only include the sub-project if Qt was actually found
+find_package(Qt5 OPTIONAL_COMPONENTS Core Widgets)
+if(Qt5_FOUND EQUAL 0)
+	message("Qt5 was not found by CMake, check readme.md!")
+endif()
+
+# Was this actually found now?
+if(NOT Qt5_FOUND EQUAL 0)
+	# Information!
+	message("Found Qt5, so including the interface as an option.")
+
+	# Where the project really exists
+	add_subdirectory(Mu)
+endif()