Initial attempt at serial port support.

Move up definition.
No longer crash the Qt interface if it could not initialize audio.
2026-02-13 21:24:19 +00:00 · 2024-06-14 22:44:19 -04:00 · 2024-06-14 19:13:52 -04:00 · 2024-06-14 18:56:56 -04:00 · 2024-06-14 18:49:21 -04:00 · 2023-11-01 19:20:58 -07:00
180 changed files with 17314 additions and 5833 deletions
--- a/.circleci/config.yml
+++ b/.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
--- a/.gitignore
+++ b/.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
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,259 @@
+##############################################################################
+################################# 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'
+
+  # tvOS
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/tvos-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
+
+# tvOS
+libretro-build-tvos-arm64:
+  extends:
+    - .libretro-tvos-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
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
--- a/.idea/Mu.iml
+++ b/.idea/Mu.iml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module classpath="CMake" type="CPP_MODULE" version="4" />
--- a/.idea/misc.xml
+++ b/.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>
--- a/.idea/modules.xml
+++ b/.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>
--- a/.idea/vcs.xml
+++ b/.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>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -0,0 +1,31 @@
+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("******************************")
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+	add_compile_definitions(EMU_DEBUG=1)
+endif()
+
+# Main project sources
+add_subdirectory(src)
+
+# LibRetro Build
+add_subdirectory(libretroBuildSystem)
+
+# QT Build
+add_subdirectory(qtBuildSystem)
--- a/334
+++ b/334
@@ -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/.
--- a/bugs/accidentalFinds.txt
+++ b/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:
--- a/bugs/brokenLibretroPlatforms.txt
+++ b/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
--- a/bugs/currentBug.txt
+++ b/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)
--- a/bugs/unimplementedHardware.txt
+++ b/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
--- a/include/ads7846.h
+++ b/include/ads7846.h
--- a/include/armv5te/armsnippets.h
+++ b/include/armv5te/armsnippets.h
@@ -0,0 +1,6 @@
+#ifndef H_ARMSNIPPETS
+#define H_ARMSNIPPETS
+
+#define armloader_cb()
+
+#endif
--- a/include/armv5te/asmcode.h
+++ b/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"

--- a/include/armv5te/bitfield.h
+++ b/include/armv5te/bitfield.h
--- a/include/armv5te/cpu.h
+++ b/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
--- a/include/armv5te/cpudefs.h
+++ b/include/armv5te/cpudefs.h
--- a/include/armv5te/debug.h
+++ b/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
 }
--- a/include/armv5te/disasm.h
+++ b/include/armv5te/disasm.h
@@ -0,0 +1,19 @@
+#ifndef H_DISASM
+#define H_DISASM
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern char disasmReturnBuf[80];
+
+uint32_t disasm_arm_insn(uint32_t pc);
+uint32_t disasm_thumb_insn(uint32_t pc);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
--- a/include/armv5te/emu.h
+++ b/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>
--- a/include/armv5te/literalpool.h
+++ b/include/armv5te/literalpool.h
--- a/include/armv5te/mem.h
+++ b/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>

--- a/include/armv5te/mmu.h
+++ b/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"
--- a/include/armv5te/os/os.h
+++ b/include/armv5te/os/os.h
--- a/include/armv5te/translate.h
+++ b/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

--- a/include/armv5te/uArm/CPU_2.h
+++ b/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
--- a/include/armv5te/uArm/icache.h
+++ b/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
--- a/include/armv5te/uArm/uArmGlue.h
+++ b/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
--- a/include/audio/blip_buf.h
+++ b/include/audio/blip_buf.h
--- a/include/dbvz.h
+++ b/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
--- a/include/dbvzRegisterAccessors.c.h
+++ b/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);
   }
@@ -714,6 +710,7 @@ static void setUstcnt2(uint16_t value){

   registerArrayWrite16(USTCNT2, value);
   updateUart2Interrupt();
+   updateUart2PortState();
 }

 static void setTstat1(uint16_t value){
@@ -815,7 +812,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 +985,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))
--- a/include/dbvzRegisterNames.c.h
+++ b/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*/
--- a/include/dbvzTiming.c.h
+++ b/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();
   }
@@ -404,6 +404,9 @@ static void dbvzEndClk32(void){
   updateUart1Interrupt();
   updateUart2Interrupt();

+   updateUart1PortState();
+   updateUart2PortState();
+
   checkInterrupts();
 }

@@ -417,11 +420,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){
--- a/include/emulator.h
+++ b/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
@@ -46,13 +45,15 @@ static void debugLog(char* str, ...){};
 //config options
 #define EMU_FPS 60
 #define DBVZ_SYSCLK_PRECISION 2000000//the amount of cycles to run before adding SYSCLKs, higher = faster, higher values may skip timer events and lower audio accuracy
+
 #define AUDIO_SAMPLE_RATE 48000
+#define AUDIO_SAMPLES_PER_FRAME (AUDIO_SAMPLE_RATE / EMU_FPS)
+
 #define AUDIO_SPEAKER_RANGE 0x6000//prevent hitting the top or bottom of the speaker when switching direction rapidly
 #define SD_CARD_NCR_BYTES 1//how many 0xFF bytes come before the R1 response
 #define SAVE_STATE_VERSION 0x00000001

 //shared constants
-#define AUDIO_SAMPLES_PER_FRAME (AUDIO_SAMPLE_RATE / EMU_FPS)
 #define SD_CARD_BLOCK_SIZE 512//all newer SDSC cards have this fixed at 512
 #define SD_CARD_BLOCK_DATA_PACKET_SIZE (1 + SD_CARD_BLOCK_SIZE + 2)
 #define SD_CARD_RESPONSE_FIFO_SIZE (SD_CARD_BLOCK_DATA_PACKET_SIZE * 3)
@@ -61,7 +62,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,8 +99,17 @@ 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{
+typedef struct {
   bool     enable;
   bool     enableParity;
   bool     oddParity;
@@ -176,6 +187,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 +215,11 @@ 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, const char *serialPortDev);
+
 void emulatorDeinit(void);
 void emulatorHardReset(void);
 void emulatorSoftReset(void);
--- a/include/fileLauncher/launcher.h
+++ b/include/fileLauncher/launcher.h
--- a/include/fixings.h
+++ b/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
--- a/include/flx68000.h
+++ b/include/flx68000.h
--- a/include/m5XXBus.h
+++ b/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
--- a/include/m68k/m68k.h
+++ b/include/m68k/m68k.h
@@ -86,7 +86,8 @@ enum
   M68K_CPU_TYPE_68EC020,
   M68K_CPU_TYPE_68020,
   M68K_CPU_TYPE_68030,	/* Supported by disassembler ONLY */
-   M68K_CPU_TYPE_68040		/* Supported by disassembler ONLY */
+   M68K_CPU_TYPE_68040, /* Supported by disassembler ONLY */
+   M68K_CPU_TYPE_DBVZ
 };

 /* Registers used by m68k_get_reg() and m68k_set_reg() */
@@ -338,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);
--- a/include/m68k/m68kconf.h
+++ b/include/m68k/m68kconf.h
@@ -133,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.
@@ -183,16 +179,6 @@
 */


-/* Set to your compiler's static inline keyword to enable it, or
- * set it to blank to disable it.
- * If you define MUSASHI_INLINE in the makefile, it will override this value.
- * NOTE: not enabling inline functions will SEVERELY slow down emulation.
- */
-#ifndef MUSASHI_INLINE
-#define MUSASHI_INLINE static inline
-#endif /* MUSASHI_INLINE */
-
-
 /* ======================================================================== */
 /* ============================== END OF FILE ============================= */
 /* ======================================================================== */
--- a/include/m68k/m68kcpu.h
+++ b/include/m68k/m68kcpu.h
@@ -836,120 +836,120 @@ extern uint           m68ki_aerr_write_mode;
 extern uint           m68ki_aerr_fc;

 /* Read data immediately after the program counter */
-MUSASHI_INLINE uint m68ki_read_imm_16(void);
-MUSASHI_INLINE uint m68ki_read_imm_32(void);
+static inline uint m68ki_read_imm_16(void);
+static inline uint m68ki_read_imm_32(void);

 /* Read data with specific function code */
-MUSASHI_INLINE uint m68ki_read_8_fc  (uint address, uint fc);
-MUSASHI_INLINE uint m68ki_read_16_fc (uint address, uint fc);
-MUSASHI_INLINE uint m68ki_read_32_fc (uint address, uint fc);
+static inline uint m68ki_read_8_fc  (uint address, uint fc);
+static inline uint m68ki_read_16_fc (uint address, uint fc);
+static inline uint m68ki_read_32_fc (uint address, uint fc);

 /* Write data with specific function code */
-MUSASHI_INLINE void m68ki_write_8_fc (uint address, uint fc, uint value);
-MUSASHI_INLINE void m68ki_write_16_fc(uint address, uint fc, uint value);
-MUSASHI_INLINE void m68ki_write_32_fc(uint address, uint fc, uint value);
+static inline void m68ki_write_8_fc (uint address, uint fc, uint value);
+static inline void m68ki_write_16_fc(uint address, uint fc, uint value);
+static inline void m68ki_write_32_fc(uint address, uint fc, uint value);
 #if M68K_SIMULATE_PD_WRITES
-MUSASHI_INLINE void m68ki_write_32_pd_fc(uint address, uint fc, uint value);
+static inline void m68ki_write_32_pd_fc(uint address, uint fc, uint value);
 #endif /* M68K_SIMULATE_PD_WRITES */

 /* Indexed and PC-relative ea fetching */
-MUSASHI_INLINE uint m68ki_get_ea_pcdi(void);
-MUSASHI_INLINE uint m68ki_get_ea_pcix(void);
-MUSASHI_INLINE uint m68ki_get_ea_ix(uint An);
+static inline uint m68ki_get_ea_pcdi(void);
+static inline uint m68ki_get_ea_pcix(void);
+static inline uint m68ki_get_ea_ix(uint An);

 /* Operand fetching */
-MUSASHI_INLINE uint OPER_AY_AI_8(void);
-MUSASHI_INLINE uint OPER_AY_AI_16(void);
-MUSASHI_INLINE uint OPER_AY_AI_32(void);
-MUSASHI_INLINE uint OPER_AY_PI_8(void);
-MUSASHI_INLINE uint OPER_AY_PI_16(void);
-MUSASHI_INLINE uint OPER_AY_PI_32(void);
-MUSASHI_INLINE uint OPER_AY_PD_8(void);
-MUSASHI_INLINE uint OPER_AY_PD_16(void);
-MUSASHI_INLINE uint OPER_AY_PD_32(void);
-MUSASHI_INLINE uint OPER_AY_DI_8(void);
-MUSASHI_INLINE uint OPER_AY_DI_16(void);
-MUSASHI_INLINE uint OPER_AY_DI_32(void);
-MUSASHI_INLINE uint OPER_AY_IX_8(void);
-MUSASHI_INLINE uint OPER_AY_IX_16(void);
-MUSASHI_INLINE uint OPER_AY_IX_32(void);
+static inline uint OPER_AY_AI_8(void);
+static inline uint OPER_AY_AI_16(void);
+static inline uint OPER_AY_AI_32(void);
+static inline uint OPER_AY_PI_8(void);
+static inline uint OPER_AY_PI_16(void);
+static inline uint OPER_AY_PI_32(void);
+static inline uint OPER_AY_PD_8(void);
+static inline uint OPER_AY_PD_16(void);
+static inline uint OPER_AY_PD_32(void);
+static inline uint OPER_AY_DI_8(void);
+static inline uint OPER_AY_DI_16(void);
+static inline uint OPER_AY_DI_32(void);
+static inline uint OPER_AY_IX_8(void);
+static inline uint OPER_AY_IX_16(void);
+static inline uint OPER_AY_IX_32(void);

-MUSASHI_INLINE uint OPER_AX_AI_8(void);
-MUSASHI_INLINE uint OPER_AX_AI_16(void);
-MUSASHI_INLINE uint OPER_AX_AI_32(void);
-MUSASHI_INLINE uint OPER_AX_PI_8(void);
-MUSASHI_INLINE uint OPER_AX_PI_16(void);
-MUSASHI_INLINE uint OPER_AX_PI_32(void);
-MUSASHI_INLINE uint OPER_AX_PD_8(void);
-MUSASHI_INLINE uint OPER_AX_PD_16(void);
-MUSASHI_INLINE uint OPER_AX_PD_32(void);
-MUSASHI_INLINE uint OPER_AX_DI_8(void);
-MUSASHI_INLINE uint OPER_AX_DI_16(void);
-MUSASHI_INLINE uint OPER_AX_DI_32(void);
-MUSASHI_INLINE uint OPER_AX_IX_8(void);
-MUSASHI_INLINE uint OPER_AX_IX_16(void);
-MUSASHI_INLINE uint OPER_AX_IX_32(void);
+static inline uint OPER_AX_AI_8(void);
+static inline uint OPER_AX_AI_16(void);
+static inline uint OPER_AX_AI_32(void);
+static inline uint OPER_AX_PI_8(void);
+static inline uint OPER_AX_PI_16(void);
+static inline uint OPER_AX_PI_32(void);
+static inline uint OPER_AX_PD_8(void);
+static inline uint OPER_AX_PD_16(void);
+static inline uint OPER_AX_PD_32(void);
+static inline uint OPER_AX_DI_8(void);
+static inline uint OPER_AX_DI_16(void);
+static inline uint OPER_AX_DI_32(void);
+static inline uint OPER_AX_IX_8(void);
+static inline uint OPER_AX_IX_16(void);
+static inline uint OPER_AX_IX_32(void);

-MUSASHI_INLINE uint OPER_A7_PI_8(void);
-MUSASHI_INLINE uint OPER_A7_PD_8(void);
+static inline uint OPER_A7_PI_8(void);
+static inline uint OPER_A7_PD_8(void);

-MUSASHI_INLINE uint OPER_AW_8(void);
-MUSASHI_INLINE uint OPER_AW_16(void);
-MUSASHI_INLINE uint OPER_AW_32(void);
-MUSASHI_INLINE uint OPER_AL_8(void);
-MUSASHI_INLINE uint OPER_AL_16(void);
-MUSASHI_INLINE uint OPER_AL_32(void);
-MUSASHI_INLINE uint OPER_PCDI_8(void);
-MUSASHI_INLINE uint OPER_PCDI_16(void);
-MUSASHI_INLINE uint OPER_PCDI_32(void);
-MUSASHI_INLINE uint OPER_PCIX_8(void);
-MUSASHI_INLINE uint OPER_PCIX_16(void);
-MUSASHI_INLINE uint OPER_PCIX_32(void);
+static inline uint OPER_AW_8(void);
+static inline uint OPER_AW_16(void);
+static inline uint OPER_AW_32(void);
+static inline uint OPER_AL_8(void);
+static inline uint OPER_AL_16(void);
+static inline uint OPER_AL_32(void);
+static inline uint OPER_PCDI_8(void);
+static inline uint OPER_PCDI_16(void);
+static inline uint OPER_PCDI_32(void);
+static inline uint OPER_PCIX_8(void);
+static inline uint OPER_PCIX_16(void);
+static inline uint OPER_PCIX_32(void);

 /* Stack operations */
-MUSASHI_INLINE void m68ki_push_16(uint value);
-MUSASHI_INLINE void m68ki_push_32(uint value);
-MUSASHI_INLINE uint m68ki_pull_16(void);
-MUSASHI_INLINE uint m68ki_pull_32(void);
+static inline void m68ki_push_16(uint value);
+static inline void m68ki_push_32(uint value);
+static inline uint m68ki_pull_16(void);
+static inline uint m68ki_pull_32(void);

 /* Program flow operations */
-MUSASHI_INLINE void m68ki_jump(uint new_pc);
-MUSASHI_INLINE void m68ki_jump_vector(uint vector);
-MUSASHI_INLINE void m68ki_branch_8(uint offset);
-MUSASHI_INLINE void m68ki_branch_16(uint offset);
-MUSASHI_INLINE void m68ki_branch_32(uint offset);
+static inline void m68ki_jump(uint new_pc);
+static inline void m68ki_jump_vector(uint vector);
+static inline void m68ki_branch_8(uint offset);
+static inline void m68ki_branch_16(uint offset);
+static inline void m68ki_branch_32(uint offset);

 /* Status register operations. */
-MUSASHI_INLINE void m68ki_set_s_flag(uint value);            /* Only bit 2 of value should be set (i.e. 4 or 0) */
-MUSASHI_INLINE void m68ki_set_sm_flag(uint value);           /* only bits 1 and 2 of value should be set */
-MUSASHI_INLINE void m68ki_set_ccr(uint value);               /* set the condition code register */
-MUSASHI_INLINE void m68ki_set_sr(uint value);                /* set the status register */
-MUSASHI_INLINE void m68ki_set_sr_noint(uint value);          /* set the status register */
+static inline void m68ki_set_s_flag(uint value);            /* Only bit 2 of value should be set (i.e. 4 or 0) */
+static inline void m68ki_set_sm_flag(uint value);           /* only bits 1 and 2 of value should be set */
+static inline void m68ki_set_ccr(uint value);               /* set the condition code register */
+static inline void m68ki_set_sr(uint value);                /* set the status register */
+static inline void m68ki_set_sr_noint(uint value);          /* set the status register */

 /* Exception processing */
-MUSASHI_INLINE uint m68ki_init_exception(void);              /* Initial exception processing */
+static inline uint m68ki_init_exception(void);              /* Initial exception processing */

-MUSASHI_INLINE void m68ki_stack_frame_3word(uint pc, uint sr); /* Stack various frame types */
-MUSASHI_INLINE void m68ki_stack_frame_buserr(uint sr);
+static inline void m68ki_stack_frame_3word(uint pc, uint sr); /* Stack various frame types */
+static inline void m68ki_stack_frame_buserr(uint sr);

-MUSASHI_INLINE void m68ki_stack_frame_0000(uint pc, uint sr, uint vector);
-MUSASHI_INLINE void m68ki_stack_frame_0001(uint pc, uint sr, uint vector);
-MUSASHI_INLINE void m68ki_stack_frame_0010(uint sr, uint vector);
-MUSASHI_INLINE void m68ki_stack_frame_1000(uint pc, uint sr, uint vector);
-MUSASHI_INLINE void m68ki_stack_frame_1010(uint sr, uint vector, uint pc);
-MUSASHI_INLINE void m68ki_stack_frame_1011(uint sr, uint vector, uint pc);
+static inline void m68ki_stack_frame_0000(uint pc, uint sr, uint vector);
+static inline void m68ki_stack_frame_0001(uint pc, uint sr, uint vector);
+static inline void m68ki_stack_frame_0010(uint sr, uint vector);
+static inline void m68ki_stack_frame_1000(uint pc, uint sr, uint vector);
+static inline void m68ki_stack_frame_1010(uint sr, uint vector, uint pc);
+static inline void m68ki_stack_frame_1011(uint sr, uint vector, uint pc);

-MUSASHI_INLINE void m68ki_exception_trap(uint vector);
-MUSASHI_INLINE void m68ki_exception_trapN(uint vector);
-MUSASHI_INLINE void m68ki_exception_trace(void);
-MUSASHI_INLINE void m68ki_exception_privilege_violation(void);
-MUSASHI_INLINE void m68ki_exception_1010(void);
-MUSASHI_INLINE void m68ki_exception_1111(void);
-MUSASHI_INLINE void m68ki_exception_illegal(void);
-MUSASHI_INLINE void m68ki_exception_format_error(void);
-MUSASHI_INLINE void m68ki_exception_address_error(void);
-MUSASHI_INLINE void m68ki_exception_interrupt(uint int_level);
-MUSASHI_INLINE void m68ki_check_interrupts(void);            /* ASG: check for interrupts */
+static inline void m68ki_exception_trap(uint vector);
+static inline void m68ki_exception_trapN(uint vector);
+static inline void m68ki_exception_trace(void);
+static inline void m68ki_exception_privilege_violation(void);
+static inline void m68ki_exception_1010(void);
+static inline void m68ki_exception_1111(void);
+static inline void m68ki_exception_illegal(void);
+static inline void m68ki_exception_format_error(void);
+static inline void m68ki_exception_address_error(void);
+static inline void m68ki_exception_interrupt(uint int_level);
+static inline void m68ki_check_interrupts(void);            /* ASG: check for interrupts */

 /* quick disassembly (used for logging) */
 char* m68ki_disassemble_quick(uint32_t pc, uint32_t cpu_type);
@@ -965,7 +965,7 @@ char* m68ki_disassemble_quick(uint32_t pc, uint32_t cpu_type);
 /* Handles all immediate reads, does address error check, function code setting,
 * and prefetching if they are enabled in m68kconf.h
 */
-MUSASHI_INLINE uint m68ki_read_imm_16(void)
+static inline uint m68ki_read_imm_16(void)
 {
   m68ki_set_fc(FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
   m68ki_check_address_error(REG_PC, MODE_READ, FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
@@ -982,7 +982,7 @@ MUSASHI_INLINE uint m68ki_read_imm_16(void)
   return m68k_read_immediate_16(ADDRESS_68K(REG_PC-2));
 #endif /* M68K_EMULATE_PREFETCH */
 }
-MUSASHI_INLINE uint m68ki_read_imm_32(void)
+static inline uint m68ki_read_imm_32(void)
 {
 #if M68K_EMULATE_PREFETCH
   uint temp_val;
@@ -1023,36 +1023,36 @@ MUSASHI_INLINE uint m68ki_read_imm_32(void)
 * These functions will also check for address error and set the function
 * code if they are enabled in m68kconf.h.
 */
-MUSASHI_INLINE uint m68ki_read_8_fc(uint address, uint fc)
+static inline uint m68ki_read_8_fc(uint address, uint fc)
 {
   m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
   return m68k_read_memory_8(ADDRESS_68K(address));
 }
-MUSASHI_INLINE uint m68ki_read_16_fc(uint address, uint fc)
+static inline uint m68ki_read_16_fc(uint address, uint fc)
 {
   m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
   m68ki_check_address_error(address, MODE_READ, fc); /* auto-disable (see m68kcpu.h) */
   return m68k_read_memory_16(ADDRESS_68K(address));
 }
-MUSASHI_INLINE uint m68ki_read_32_fc(uint address, uint fc)
+static inline uint m68ki_read_32_fc(uint address, uint fc)
 {
   m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
   m68ki_check_address_error(address, MODE_READ, fc); /* auto-disable (see m68kcpu.h) */
   return m68k_read_memory_32(ADDRESS_68K(address));
 }

-MUSASHI_INLINE void m68ki_write_8_fc(uint address, uint fc, uint value)
+static inline void m68ki_write_8_fc(uint address, uint fc, uint value)
 {
   m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
   m68k_write_memory_8(ADDRESS_68K(address), value);
 }
-MUSASHI_INLINE void m68ki_write_16_fc(uint address, uint fc, uint value)
+static inline void m68ki_write_16_fc(uint address, uint fc, uint value)
 {
   m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
   m68ki_check_address_error(address, MODE_WRITE, fc); /* auto-disable (see m68kcpu.h) */
   m68k_write_memory_16(ADDRESS_68K(address), value);
 }
-MUSASHI_INLINE void m68ki_write_32_fc(uint address, uint fc, uint value)
+static inline void m68ki_write_32_fc(uint address, uint fc, uint value)
 {
   m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
   m68ki_check_address_error(address, MODE_WRITE, fc); /* auto-disable (see m68kcpu.h) */
@@ -1060,7 +1060,7 @@ MUSASHI_INLINE void m68ki_write_32_fc(uint address, uint fc, uint value)
 }

 #if M68K_SIMULATE_PD_WRITES
-MUSASHI_INLINE void m68ki_write_32_pd_fc(uint address, uint fc, uint value)
+static inline void m68ki_write_32_pd_fc(uint address, uint fc, uint value)
 {
   m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
   m68ki_check_address_error(address, MODE_WRITE, fc); /* auto-disable (see m68kcpu.h) */
@@ -1074,7 +1074,7 @@ MUSASHI_INLINE void m68ki_write_32_pd_fc(uint address, uint fc, uint value)
 /* The program counter relative addressing modes cause operands to be
 * retrieved from program space, not data space.
 */
-MUSASHI_INLINE uint m68ki_get_ea_pcdi(void)
+static inline uint m68ki_get_ea_pcdi(void)
 {
   uint old_pc = REG_PC;
   m68ki_use_program_space(); /* auto-disable */
@@ -1082,7 +1082,7 @@ MUSASHI_INLINE uint m68ki_get_ea_pcdi(void)
 }


-MUSASHI_INLINE uint m68ki_get_ea_pcix(void)
+static inline uint m68ki_get_ea_pcix(void)
 {
   m68ki_use_program_space(); /* auto-disable */
   return m68ki_get_ea_ix(REG_PC);
@@ -1130,7 +1130,7 @@ MUSASHI_INLINE uint m68ki_get_ea_pcix(void)
 * 1  011  mem indir with long outer
 * 1  100-111  reserved
 */
-MUSASHI_INLINE uint m68ki_get_ea_ix(uint An)
+static inline uint m68ki_get_ea_ix(uint An)
 {
   /* An = base register */
   uint extension = m68ki_read_imm_16();
@@ -1203,78 +1203,78 @@ MUSASHI_INLINE uint m68ki_get_ea_ix(uint An)


 /* Fetch operands */
-MUSASHI_INLINE uint OPER_AY_AI_8(void)  {uint ea = EA_AY_AI_8();  return m68ki_read_8(ea); }
-MUSASHI_INLINE uint OPER_AY_AI_16(void) {uint ea = EA_AY_AI_16(); return m68ki_read_16(ea);}
-MUSASHI_INLINE uint OPER_AY_AI_32(void) {uint ea = EA_AY_AI_32(); return m68ki_read_32(ea);}
-MUSASHI_INLINE uint OPER_AY_PI_8(void)  {uint ea = EA_AY_PI_8();  return m68ki_read_8(ea); }
-MUSASHI_INLINE uint OPER_AY_PI_16(void) {uint ea = EA_AY_PI_16(); return m68ki_read_16(ea);}
-MUSASHI_INLINE uint OPER_AY_PI_32(void) {uint ea = EA_AY_PI_32(); return m68ki_read_32(ea);}
-MUSASHI_INLINE uint OPER_AY_PD_8(void)  {uint ea = EA_AY_PD_8();  return m68ki_read_8(ea); }
-MUSASHI_INLINE uint OPER_AY_PD_16(void) {uint ea = EA_AY_PD_16(); return m68ki_read_16(ea);}
-MUSASHI_INLINE uint OPER_AY_PD_32(void) {uint ea = EA_AY_PD_32(); return m68ki_read_32(ea);}
-MUSASHI_INLINE uint OPER_AY_DI_8(void)  {uint ea = EA_AY_DI_8();  return m68ki_read_8(ea); }
-MUSASHI_INLINE uint OPER_AY_DI_16(void) {uint ea = EA_AY_DI_16(); return m68ki_read_16(ea);}
-MUSASHI_INLINE uint OPER_AY_DI_32(void) {uint ea = EA_AY_DI_32(); return m68ki_read_32(ea);}
-MUSASHI_INLINE uint OPER_AY_IX_8(void)  {uint ea = EA_AY_IX_8();  return m68ki_read_8(ea); }
-MUSASHI_INLINE uint OPER_AY_IX_16(void) {uint ea = EA_AY_IX_16(); return m68ki_read_16(ea);}
-MUSASHI_INLINE uint OPER_AY_IX_32(void) {uint ea = EA_AY_IX_32(); return m68ki_read_32(ea);}
+static inline uint OPER_AY_AI_8(void)  {uint ea = EA_AY_AI_8();  return m68ki_read_8(ea); }
+static inline uint OPER_AY_AI_16(void) {uint ea = EA_AY_AI_16(); return m68ki_read_16(ea);}
+static inline uint OPER_AY_AI_32(void) {uint ea = EA_AY_AI_32(); return m68ki_read_32(ea);}
+static inline uint OPER_AY_PI_8(void)  {uint ea = EA_AY_PI_8();  return m68ki_read_8(ea); }
+static inline uint OPER_AY_PI_16(void) {uint ea = EA_AY_PI_16(); return m68ki_read_16(ea);}
+static inline uint OPER_AY_PI_32(void) {uint ea = EA_AY_PI_32(); return m68ki_read_32(ea);}
+static inline uint OPER_AY_PD_8(void)  {uint ea = EA_AY_PD_8();  return m68ki_read_8(ea); }
+static inline uint OPER_AY_PD_16(void) {uint ea = EA_AY_PD_16(); return m68ki_read_16(ea);}
+static inline uint OPER_AY_PD_32(void) {uint ea = EA_AY_PD_32(); return m68ki_read_32(ea);}
+static inline uint OPER_AY_DI_8(void)  {uint ea = EA_AY_DI_8();  return m68ki_read_8(ea); }
+static inline uint OPER_AY_DI_16(void) {uint ea = EA_AY_DI_16(); return m68ki_read_16(ea);}
+static inline uint OPER_AY_DI_32(void) {uint ea = EA_AY_DI_32(); return m68ki_read_32(ea);}
+static inline uint OPER_AY_IX_8(void)  {uint ea = EA_AY_IX_8();  return m68ki_read_8(ea); }
+static inline uint OPER_AY_IX_16(void) {uint ea = EA_AY_IX_16(); return m68ki_read_16(ea);}
+static inline uint OPER_AY_IX_32(void) {uint ea = EA_AY_IX_32(); return m68ki_read_32(ea);}

-MUSASHI_INLINE uint OPER_AX_AI_8(void)  {uint ea = EA_AX_AI_8();  return m68ki_read_8(ea); }
-MUSASHI_INLINE uint OPER_AX_AI_16(void) {uint ea = EA_AX_AI_16(); return m68ki_read_16(ea);}
-MUSASHI_INLINE uint OPER_AX_AI_32(void) {uint ea = EA_AX_AI_32(); return m68ki_read_32(ea);}
-MUSASHI_INLINE uint OPER_AX_PI_8(void)  {uint ea = EA_AX_PI_8();  return m68ki_read_8(ea); }
-MUSASHI_INLINE uint OPER_AX_PI_16(void) {uint ea = EA_AX_PI_16(); return m68ki_read_16(ea);}
-MUSASHI_INLINE uint OPER_AX_PI_32(void) {uint ea = EA_AX_PI_32(); return m68ki_read_32(ea);}
-MUSASHI_INLINE uint OPER_AX_PD_8(void)  {uint ea = EA_AX_PD_8();  return m68ki_read_8(ea); }
-MUSASHI_INLINE uint OPER_AX_PD_16(void) {uint ea = EA_AX_PD_16(); return m68ki_read_16(ea);}
-MUSASHI_INLINE uint OPER_AX_PD_32(void) {uint ea = EA_AX_PD_32(); return m68ki_read_32(ea);}
-MUSASHI_INLINE uint OPER_AX_DI_8(void)  {uint ea = EA_AX_DI_8();  return m68ki_read_8(ea); }
-MUSASHI_INLINE uint OPER_AX_DI_16(void) {uint ea = EA_AX_DI_16(); return m68ki_read_16(ea);}
-MUSASHI_INLINE uint OPER_AX_DI_32(void) {uint ea = EA_AX_DI_32(); return m68ki_read_32(ea);}
-MUSASHI_INLINE uint OPER_AX_IX_8(void)  {uint ea = EA_AX_IX_8();  return m68ki_read_8(ea); }
-MUSASHI_INLINE uint OPER_AX_IX_16(void) {uint ea = EA_AX_IX_16(); return m68ki_read_16(ea);}
-MUSASHI_INLINE uint OPER_AX_IX_32(void) {uint ea = EA_AX_IX_32(); return m68ki_read_32(ea);}
+static inline uint OPER_AX_AI_8(void)  {uint ea = EA_AX_AI_8();  return m68ki_read_8(ea); }
+static inline uint OPER_AX_AI_16(void) {uint ea = EA_AX_AI_16(); return m68ki_read_16(ea);}
+static inline uint OPER_AX_AI_32(void) {uint ea = EA_AX_AI_32(); return m68ki_read_32(ea);}
+static inline uint OPER_AX_PI_8(void)  {uint ea = EA_AX_PI_8();  return m68ki_read_8(ea); }
+static inline uint OPER_AX_PI_16(void) {uint ea = EA_AX_PI_16(); return m68ki_read_16(ea);}
+static inline uint OPER_AX_PI_32(void) {uint ea = EA_AX_PI_32(); return m68ki_read_32(ea);}
+static inline uint OPER_AX_PD_8(void)  {uint ea = EA_AX_PD_8();  return m68ki_read_8(ea); }
+static inline uint OPER_AX_PD_16(void) {uint ea = EA_AX_PD_16(); return m68ki_read_16(ea);}
+static inline uint OPER_AX_PD_32(void) {uint ea = EA_AX_PD_32(); return m68ki_read_32(ea);}
+static inline uint OPER_AX_DI_8(void)  {uint ea = EA_AX_DI_8();  return m68ki_read_8(ea); }
+static inline uint OPER_AX_DI_16(void) {uint ea = EA_AX_DI_16(); return m68ki_read_16(ea);}
+static inline uint OPER_AX_DI_32(void) {uint ea = EA_AX_DI_32(); return m68ki_read_32(ea);}
+static inline uint OPER_AX_IX_8(void)  {uint ea = EA_AX_IX_8();  return m68ki_read_8(ea); }
+static inline uint OPER_AX_IX_16(void) {uint ea = EA_AX_IX_16(); return m68ki_read_16(ea);}
+static inline uint OPER_AX_IX_32(void) {uint ea = EA_AX_IX_32(); return m68ki_read_32(ea);}

-MUSASHI_INLINE uint OPER_A7_PI_8(void)  {uint ea = EA_A7_PI_8();  return m68ki_read_8(ea); }
-MUSASHI_INLINE uint OPER_A7_PD_8(void)  {uint ea = EA_A7_PD_8();  return m68ki_read_8(ea); }
+static inline uint OPER_A7_PI_8(void)  {uint ea = EA_A7_PI_8();  return m68ki_read_8(ea); }
+static inline uint OPER_A7_PD_8(void)  {uint ea = EA_A7_PD_8();  return m68ki_read_8(ea); }

-MUSASHI_INLINE uint OPER_AW_8(void)     {uint ea = EA_AW_8();     return m68ki_read_8(ea); }
-MUSASHI_INLINE uint OPER_AW_16(void)    {uint ea = EA_AW_16();    return m68ki_read_16(ea);}
-MUSASHI_INLINE uint OPER_AW_32(void)    {uint ea = EA_AW_32();    return m68ki_read_32(ea);}
-MUSASHI_INLINE uint OPER_AL_8(void)     {uint ea = EA_AL_8();     return m68ki_read_8(ea); }
-MUSASHI_INLINE uint OPER_AL_16(void)    {uint ea = EA_AL_16();    return m68ki_read_16(ea);}
-MUSASHI_INLINE uint OPER_AL_32(void)    {uint ea = EA_AL_32();    return m68ki_read_32(ea);}
-MUSASHI_INLINE uint OPER_PCDI_8(void)   {uint ea = EA_PCDI_8();   return m68ki_read_pcrel_8(ea); }
-MUSASHI_INLINE uint OPER_PCDI_16(void)  {uint ea = EA_PCDI_16();  return m68ki_read_pcrel_16(ea);}
-MUSASHI_INLINE uint OPER_PCDI_32(void)  {uint ea = EA_PCDI_32();  return m68ki_read_pcrel_32(ea);}
-MUSASHI_INLINE uint OPER_PCIX_8(void)   {uint ea = EA_PCIX_8();   return m68ki_read_pcrel_8(ea); }
-MUSASHI_INLINE uint OPER_PCIX_16(void)  {uint ea = EA_PCIX_16();  return m68ki_read_pcrel_16(ea);}
-MUSASHI_INLINE uint OPER_PCIX_32(void)  {uint ea = EA_PCIX_32();  return m68ki_read_pcrel_32(ea);}
+static inline uint OPER_AW_8(void)     {uint ea = EA_AW_8();     return m68ki_read_8(ea); }
+static inline uint OPER_AW_16(void)    {uint ea = EA_AW_16();    return m68ki_read_16(ea);}
+static inline uint OPER_AW_32(void)    {uint ea = EA_AW_32();    return m68ki_read_32(ea);}
+static inline uint OPER_AL_8(void)     {uint ea = EA_AL_8();     return m68ki_read_8(ea); }
+static inline uint OPER_AL_16(void)    {uint ea = EA_AL_16();    return m68ki_read_16(ea);}
+static inline uint OPER_AL_32(void)    {uint ea = EA_AL_32();    return m68ki_read_32(ea);}
+static inline uint OPER_PCDI_8(void)   {uint ea = EA_PCDI_8();   return m68ki_read_pcrel_8(ea); }
+static inline uint OPER_PCDI_16(void)  {uint ea = EA_PCDI_16();  return m68ki_read_pcrel_16(ea);}
+static inline uint OPER_PCDI_32(void)  {uint ea = EA_PCDI_32();  return m68ki_read_pcrel_32(ea);}
+static inline uint OPER_PCIX_8(void)   {uint ea = EA_PCIX_8();   return m68ki_read_pcrel_8(ea); }
+static inline uint OPER_PCIX_16(void)  {uint ea = EA_PCIX_16();  return m68ki_read_pcrel_16(ea);}
+static inline uint OPER_PCIX_32(void)  {uint ea = EA_PCIX_32();  return m68ki_read_pcrel_32(ea);}



 /* ---------------------------- Stack Functions --------------------------- */

 /* Push/pull data from the stack */
-MUSASHI_INLINE void m68ki_push_16(uint value)
+static inline void m68ki_push_16(uint value)
 {
   REG_SP = MASK_OUT_ABOVE_32(REG_SP - 2);
   m68ki_write_16(REG_SP, value);
 }

-MUSASHI_INLINE void m68ki_push_32(uint value)
+static inline void m68ki_push_32(uint value)
 {
   REG_SP = MASK_OUT_ABOVE_32(REG_SP - 4);
   m68ki_write_32(REG_SP, value);
 }

-MUSASHI_INLINE uint m68ki_pull_16(void)
+static inline uint m68ki_pull_16(void)
 {
   REG_SP = MASK_OUT_ABOVE_32(REG_SP + 2);
   return m68ki_read_16(REG_SP-2);
 }

-MUSASHI_INLINE uint m68ki_pull_32(void)
+static inline uint m68ki_pull_32(void)
 {
   REG_SP = MASK_OUT_ABOVE_32(REG_SP + 4);
   return m68ki_read_32(REG_SP-4);
@@ -1284,22 +1284,22 @@ MUSASHI_INLINE uint m68ki_pull_32(void)
 /* Increment/decrement the stack as if doing a push/pull but
 * don't do any memory access.
 */
-MUSASHI_INLINE void m68ki_fake_push_16(void)
+static inline void m68ki_fake_push_16(void)
 {
   REG_SP = MASK_OUT_ABOVE_32(REG_SP - 2);
 }

-MUSASHI_INLINE void m68ki_fake_push_32(void)
+static inline void m68ki_fake_push_32(void)
 {
   REG_SP = MASK_OUT_ABOVE_32(REG_SP - 4);
 }

-MUSASHI_INLINE void m68ki_fake_pull_16(void)
+static inline void m68ki_fake_pull_16(void)
 {
   REG_SP = MASK_OUT_ABOVE_32(REG_SP + 2);
 }

-MUSASHI_INLINE void m68ki_fake_pull_32(void)
+static inline void m68ki_fake_pull_32(void)
 {
   REG_SP = MASK_OUT_ABOVE_32(REG_SP + 4);
 }
@@ -1311,13 +1311,13 @@ MUSASHI_INLINE void m68ki_fake_pull_32(void)
 * These functions will also call the pc_changed callback if it was enabled
 * in m68kconf.h.
 */
-MUSASHI_INLINE void m68ki_jump(uint new_pc)
+static inline void m68ki_jump(uint new_pc)
 {
   REG_PC = new_pc;
   m68ki_pc_changed(REG_PC);
 }

-MUSASHI_INLINE void m68ki_jump_vector(uint vector)
+static inline void m68ki_jump_vector(uint vector)
 {
   REG_PC = (vector<<2) + REG_VBR;
   REG_PC = m68ki_read_data_32(REG_PC);
@@ -1330,17 +1330,17 @@ MUSASHI_INLINE void m68ki_jump_vector(uint vector)
 * So far I've found no problems with not calling pc_changed for 8 or 16
 * bit branches.
 */
-MUSASHI_INLINE void m68ki_branch_8(uint offset)
+static inline void m68ki_branch_8(uint offset)
 {
   REG_PC += MAKE_INT_8(offset);
 }

-MUSASHI_INLINE void m68ki_branch_16(uint offset)
+static inline void m68ki_branch_16(uint offset)
 {
   REG_PC += MAKE_INT_16(offset);
 }

-MUSASHI_INLINE void m68ki_branch_32(uint offset)
+static inline void m68ki_branch_32(uint offset)
 {
   REG_PC += offset;
   m68ki_pc_changed(REG_PC);
@@ -1353,7 +1353,7 @@ MUSASHI_INLINE void m68ki_branch_32(uint offset)
 /* Set the S flag and change the active stack pointer.
 * Note that value MUST be 4 or 0.
 */
-MUSASHI_INLINE void m68ki_set_s_flag(uint value)
+static inline void m68ki_set_s_flag(uint value)
 {
   /* Backup the old stack pointer */
   REG_SP_BASE[FLAG_S | ((FLAG_S>>1) & FLAG_M)] = REG_SP;
@@ -1366,7 +1366,7 @@ MUSASHI_INLINE void m68ki_set_s_flag(uint value)
 /* Set the S and M flags and change the active stack pointer.
 * Note that value MUST be 0, 2, 4, or 6 (bit2 = S, bit1 = M).
 */
-MUSASHI_INLINE void m68ki_set_sm_flag(uint value)
+static inline void m68ki_set_sm_flag(uint value)
 {
   /* Backup the old stack pointer */
   REG_SP_BASE[FLAG_S | ((FLAG_S>>1) & FLAG_M)] = REG_SP;
@@ -1378,7 +1378,7 @@ MUSASHI_INLINE void m68ki_set_sm_flag(uint value)
 }

 /* Set the S and M flags.  Don't touch the stack pointer. */
-MUSASHI_INLINE void m68ki_set_sm_flag_nosp(uint value)
+static inline void m68ki_set_sm_flag_nosp(uint value)
 {
   /* Set the S and M flags */
   FLAG_S = value & SFLAG_SET;
@@ -1387,7 +1387,7 @@ MUSASHI_INLINE void m68ki_set_sm_flag_nosp(uint value)


 /* Set the condition code register */
-MUSASHI_INLINE void m68ki_set_ccr(uint value)
+static inline void m68ki_set_ccr(uint value)
 {
   FLAG_X = BIT_4(value)  << 4;
   FLAG_N = BIT_3(value)  << 4;
@@ -1397,7 +1397,7 @@ MUSASHI_INLINE void m68ki_set_ccr(uint value)
 }

 /* Set the status register but don't check for interrupts */
-MUSASHI_INLINE void m68ki_set_sr_noint(uint value)
+static inline void m68ki_set_sr_noint(uint value)
 {
   /* Mask out the "unimplemented" bits */
   value &= CPU_SR_MASK;
@@ -1413,7 +1413,7 @@ MUSASHI_INLINE void m68ki_set_sr_noint(uint value)
 /* Set the status register but don't check for interrupts nor
 * change the stack pointer
 */
-MUSASHI_INLINE void m68ki_set_sr_noint_nosp(uint value)
+static inline void m68ki_set_sr_noint_nosp(uint value)
 {
   /* Mask out the "unimplemented" bits */
   value &= CPU_SR_MASK;
@@ -1427,7 +1427,7 @@ MUSASHI_INLINE void m68ki_set_sr_noint_nosp(uint value)
 }

 /* Set the status register and check for interrupts */
-MUSASHI_INLINE void m68ki_set_sr(uint value)
+static inline void m68ki_set_sr(uint value)
 {
   m68ki_set_sr_noint(value);
   m68ki_check_interrupts();
@@ -1437,7 +1437,7 @@ MUSASHI_INLINE void m68ki_set_sr(uint value)
 /* ------------------------- Exception Processing ------------------------- */

 /* Initiate exception processing */
-MUSASHI_INLINE uint m68ki_init_exception(void)
+static inline uint m68ki_init_exception(void)
 {
   /* Save the old status register */
   uint sr = m68ki_get_sr();
@@ -1452,7 +1452,7 @@ MUSASHI_INLINE uint m68ki_init_exception(void)
 }

 /* 3 word stack frame (68000 only) */
-MUSASHI_INLINE void m68ki_stack_frame_3word(uint pc, uint sr)
+static inline void m68ki_stack_frame_3word(uint pc, uint sr)
 {
   m68ki_push_32(pc);
   m68ki_push_16(sr);
@@ -1461,7 +1461,7 @@ MUSASHI_INLINE void m68ki_stack_frame_3word(uint pc, uint sr)
 /* Format 0 stack frame.
 * This is the standard stack frame for 68010+.
 */
-MUSASHI_INLINE void m68ki_stack_frame_0000(uint pc, uint sr, uint vector)
+static inline void m68ki_stack_frame_0000(uint pc, uint sr, uint vector)
 {
   /* Stack a 3-word frame if we are 68000 */
   if(CPU_TYPE == CPU_TYPE_000)
@@ -1477,7 +1477,7 @@ MUSASHI_INLINE void m68ki_stack_frame_0000(uint pc, uint sr, uint vector)
 /* Format 1 stack frame (68020).
 * For 68020, this is the 4 word throwaway frame.
 */
-MUSASHI_INLINE void m68ki_stack_frame_0001(uint pc, uint sr, uint vector)
+static inline void m68ki_stack_frame_0001(uint pc, uint sr, uint vector)
 {
   m68ki_push_16(0x1000 | (vector<<2));
   m68ki_push_32(pc);
@@ -1487,7 +1487,7 @@ MUSASHI_INLINE void m68ki_stack_frame_0001(uint pc, uint sr, uint vector)
 /* Format 2 stack frame.
 * This is used only by 68020 for trap exceptions.
 */
-MUSASHI_INLINE void m68ki_stack_frame_0010(uint sr, uint vector)
+static inline void m68ki_stack_frame_0010(uint sr, uint vector)
 {
   m68ki_push_32(REG_PPC);
   m68ki_push_16(0x2000 | (vector<<2));
@@ -1498,7 +1498,7 @@ MUSASHI_INLINE void m68ki_stack_frame_0010(uint sr, uint vector)

 /* Bus error stack frame (68000 only).
 */
-MUSASHI_INLINE void m68ki_stack_frame_buserr(uint sr)
+static inline void m68ki_stack_frame_buserr(uint sr)
 {
   m68ki_push_32(REG_PC);
   m68ki_push_16(sr);
@@ -1687,7 +1687,7 @@ void m68ki_stack_frame_1011(uint sr, uint vector, uint pc)
 /* Used for Group 2 exceptions.
 * These stack a type 2 frame on the 020.
 */
-MUSASHI_INLINE void m68ki_exception_trap(uint vector)
+static inline void m68ki_exception_trap(uint vector)
 {
   uint sr = m68ki_init_exception();

@@ -1703,7 +1703,7 @@ MUSASHI_INLINE void m68ki_exception_trap(uint vector)
 }

 /* Trap#n stacks a 0 frame but behaves like group2 otherwise */
-MUSASHI_INLINE void m68ki_exception_trapN(uint vector)
+static inline void m68ki_exception_trapN(uint vector)
 {
   uint sr = m68ki_init_exception();
   m68ki_stack_frame_0000(REG_PC, sr, vector);
@@ -1714,7 +1714,7 @@ MUSASHI_INLINE void m68ki_exception_trapN(uint vector)
 }

 /* Exception for trace mode */
-MUSASHI_INLINE void m68ki_exception_trace(void)
+static inline void m68ki_exception_trace(void)
 {
   uint sr = m68ki_init_exception();

@@ -1741,7 +1741,7 @@ MUSASHI_INLINE void m68ki_exception_trace(void)
 }

 /* Exception for privilege violation */
-MUSASHI_INLINE void m68ki_exception_privilege_violation(void)
+static inline void m68ki_exception_privilege_violation(void)
 {
   uint sr = m68ki_init_exception();

@@ -1760,11 +1760,11 @@ MUSASHI_INLINE void m68ki_exception_privilege_violation(void)
 }

 /* Exception for A-Line instructions */
-MUSASHI_INLINE void m68ki_exception_1010(void)
+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
@@ -1778,12 +1778,12 @@ MUSASHI_INLINE void m68ki_exception_1010(void)
 }

 /* Exception for F-Line instructions */
-MUSASHI_INLINE void m68ki_exception_1111(void)
+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
@@ -1797,11 +1797,11 @@ MUSASHI_INLINE void m68ki_exception_1111(void)
 }

 /* Exception for illegal instructions */
-MUSASHI_INLINE void m68ki_exception_illegal(void)
+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))));

@@ -1822,7 +1822,7 @@ MUSASHI_INLINE void m68ki_exception_illegal(void)
 }

 /* Exception for format errror in RTE */
-MUSASHI_INLINE void m68ki_exception_format_error(void)
+static inline void m68ki_exception_format_error(void)
 {
   uint sr = m68ki_init_exception();
   m68ki_stack_frame_0000(REG_PC, sr, EXCEPTION_FORMAT_ERROR);
@@ -1833,7 +1833,7 @@ MUSASHI_INLINE void m68ki_exception_format_error(void)
 }

 /* Exception for address error */
-MUSASHI_INLINE void m68ki_exception_address_error(void)
+static inline void m68ki_exception_address_error(void)
 {
   uint sr = m68ki_init_exception();

@@ -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;
   }
@@ -1936,7 +1936,7 @@ void m68ki_exception_interrupt(uint int_level)


 /* ASG: Check for interrupts */
-MUSASHI_INLINE void m68ki_check_interrupts(void)
+static inline void m68ki_check_interrupts(void)
 {
   if(CPU_INT_LEVEL > FLAG_INT_MASK)
      m68ki_exception_interrupt(CPU_INT_LEVEL>>8);
--- a/include/m68k/m68kexternal.h
+++ b/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
--- a/include/m68k/m68kops.h
+++ b/include/m68k/m68kops.h
--- a/include/pdiUsbD12.h
+++ b/include/pdiUsbD12.h
--- a/include/pdiUsbD12CommandNames.c.h
+++ b/include/pdiUsbD12CommandNames.c.h
--- a/include/portability.h
+++ b/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)))
--- a/include/pxa260/pxa260.h
+++ b/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;
--- a/include/pxa260/pxa260Accessors.c.h
+++ b/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){
--- a/include/pxa260/pxa260I2c.h
+++ b/include/pxa260/pxa260I2c.h
--- a/include/pxa260/pxa260Memctrl.h
+++ b/include/pxa260/pxa260Memctrl.h
--- a/include/pxa260/pxa260Ssp.h
+++ b/include/pxa260/pxa260Ssp.h
--- a/include/pxa260/pxa260Timing.h
+++ b/include/pxa260/pxa260Timing.h
--- a/include/pxa260/pxa260Udc.h
+++ b/include/pxa260/pxa260Udc.h
--- a/include/pxa260/pxa260_CPU.h
+++ b/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
+
--- a/include/pxa260/pxa260_DMA.h
+++ b/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"
--- a/include/pxa260/pxa260_DSP.h
+++ b/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"

--- a/include/pxa260/pxa260_GPIO.h
+++ b/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"
--- a/include/pxa260/pxa260_IC.h
+++ b/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> 
--- a/include/pxa260/pxa260_LCD.h
+++ b/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
--- a/include/pxa260/pxa260_PwrClk.h
+++ b/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"

--- a/include/pxa260/pxa260_RTC.h
+++ b/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"
--- a/include/pxa260/pxa260_TIMR.h
+++ b/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"
--- a/include/pxa260/pxa260_UART.h
+++ b/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"
--- a/include/pxa260/pxa260_math64.h
+++ b/include/pxa260/pxa260_math64.h
--- a/include/pxa260/pxa260_types.h
+++ b/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)
--- a/include/sdCard.h
+++ b/include/sdCard.h
--- a/include/sdCardAccessors.c.h
+++ b/include/sdCardAccessors.c.h
--- a/include/sdCardCommandNames.c.h
+++ b/include/sdCardCommandNames.c.h
--- a/include/sdCardCrcTables.c.h
+++ b/include/sdCardCrcTables.c.h
--- a/include/sed1376.h
+++ b/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
--- a/include/sed1376Accessors.c.h
+++ b/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;
-}
--- a/include/sed1376RegisterNames.c.h
+++ b/include/sed1376RegisterNames.c.h
--- a/include/serial.h
+++ b/include/serial.h
@@ -0,0 +1,18 @@
+//
+// Created by stephanie on 6/14/24.
+//
+
+#ifndef MU_SERIAL_H
+#define MU_SERIAL_H
+
+#include "emulator.h"
+
+/**
+ * Opens and initializes the serial port.
+ *
+ * @param path The path of the serial port.
+ * @since 2024/06/14
+ */
+void mu_serial_open_and_init(const char* path);
+
+#endif // MU_SERIAL_H
--- a/include/silkscreen.h
+++ b/include/silkscreen.h
--- a/include/tps65010.h
+++ b/include/tps65010.h
--- a/include/tsc2101.h
+++ b/include/tsc2101.h
--- a/include/tungstenT3Bus.h
+++ b/include/tungstenT3Bus.h
--- a/include/w86l488.h
+++ b/include/w86l488.h
--- a/libretroBuildSystem/CMakeLists.txt
+++ b/libretroBuildSystem/CMakeLists.txt
@@ -0,0 +1,54 @@
+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 "")
+
+# Define these
+target_compile_definitions(mu_libretro PUBLIC
+	__LIBRETRO__=1)
+
+# 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()
+	find_program(RETROARCH_APP retroarch)
+	if(RETROARCH_APP)
+		get_filename_component(MU_LIBRETRO_DIR "${RETROARCH_APP}" DIRECTORY)
+	endif()
+
+	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()
--- a/libretroBuildSystem/Makefile.libretro
+++ b/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
@@ -171,6 +186,8 @@ else ifeq ($(platform), tvos-arm64)
 ifeq ($(IOSSDK),)
   IOSSDK := $(shell xcodebuild -version -sdk appletvos Path)
 endif
+   CC = clang -arch arm64 -isysroot $(IOSSDK)
+   CXX = clang++ -arch arm64 -isysroot $(IOSSDK)

 # Theos iOS
 else ifeq ($(platform), theos_ios)
@@ -193,33 +210,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

@@ -394,7 +393,9 @@ else ifneq (,$(findstring armv,$(platform)))
 # Emscripten
 else ifeq ($(platform), emscripten)
 	TARGET := $(TARGET_NAME)_libretro_emscripten.bc
+	AR=emar
 	STATIC_LINKING = 1
+	STATIC_LINKING_LINK = 1

 # GCW0
 else ifeq ($(platform), gcw0)
@@ -451,6 +452,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
@@ -528,9 +539,7 @@ all: $(TARGET)

 $(TARGET): $(OBJECTS)
 	@echo "** BUILDING $(TARGET) FOR PLATFORM $(platform) **"
-ifeq ($(platform), emscripten)
-	$(CC) $(CFLAGS) $(OBJOUT)$@ $^
-else ifeq ($(STATIC_LINKING_LINK), 1)
+ifeq ($(STATIC_LINKING_LINK), 1)
 ifneq (,$(findstring msvc,$(platform)))
 	$(LD) $(LINKOUT)$@ $(OBJECTS)
 else
--- a/libretroBuildSystem/build/Makefile.common
+++ b/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)
--- a/libretroBuildSystem/build/Makefile.windows_msvc2003_x86
+++ b/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),)
--- a/libretroBuildSystem/build/Makefile.windows_msvc2005_x86
+++ b/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),)
--- a/libretroBuildSystem/build/Makefile.windows_msvc2008_x86
+++ b/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),)
--- a/libretroBuildSystem/build/Makefile.windows_msvc2010_x64
+++ b/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),)
--- a/libretroBuildSystem/build/Makefile.windows_msvc2010_x86
+++ b/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),)
--- a/libretroBuildSystem/build/Makefile.windows_msvc2015_x64
+++ b/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),)
--- a/libretroBuildSystem/jni/Application.mk
+++ b/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
--- a/libretroBuildSystem/libretro-common/include/libretro.h
+++ b/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
--- a/libretroBuildSystem/libretro-common/include/memmap.h
+++ b/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>
--- a/libretroBuildSystem/libretro-common/include/retro_miscellaneous.h
+++ b/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
--- a/libretroBuildSystem/libretro-common/vfs/vfs_implementation.c
+++ b/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);
--- a/libretroBuildSystem/libretro.c
+++ b/libretroBuildSystem/libretro.c
--- a/libretroBuildSystem/miniz.c
+++ b/libretroBuildSystem/miniz.c
--- a/libretroBuildSystem/miniz.h
+++ b/libretroBuildSystem/miniz.h
--- a/libretroBuildSystem/miniz_LICENSE
+++ b/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.
--- a/libretroBuildSystem/mu_libretro.info
+++ b/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."
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stephanie Gawroriski	e8f6529bec	Initial attempt at serial port support.	2024-06-14 22:44:19 -04:00
Stephanie Gawroriski	5e5e21e302	Move up definition.	2024-06-14 19:13:52 -04:00
Stephanie Gawroriski	8223b6fd76	No longer crash the Qt interface if it could not initialize audio.	2024-06-14 18:56:56 -04:00
Stephanie Gawroriski	dee65d0d1a	Fill initial RAM with garbage so PalmOS is much more likely to find it invalid; Add RetroArch run command if it exists in PATH.	2024-06-14 18:49:21 -04:00
LibretroAdmin	865acf3a28	Update Makefile.libretro	2023-11-01 19:20:58 -07:00
Stephanie Gawroriski	15bb26daa5	Merge pull request #29 from warmenhoven/dev/warmenhoven/tvos Add tvos build	2023-05-27 18:38:29 -04:00
Eric Warmenhoven	dc854cef9e	Add tvos build	2023-05-27 17:43:15 -04:00
Stephanie Gawroriski	91a46734dd	Merge pull request #28 from libretro/wip-macosarmfix Attempt fix of macOS ARM build (Fixes #27).	2023-01-23 08:55:17 -05:00
Stephanie Gawroriski	d0651a450d	Attempt fix of macOS ARM build.	2023-01-22 17:01:37 -05:00
Stephanie Gawroriski	4a3fee96e7	README updates.	2022-10-02 17:58:21 -04:00
Stephanie Gawroriski	4d084a03d7	RetroArch CMake corrections; Implement loading from ZIP files which contain PRCs and PDBs.	2022-10-02 17:34:57 -04:00
Stephanie Gawroriski	aadb0a29ff	Include miniz library; Make all CMake builds PIC.	2022-10-02 16:25:53 -04:00
Stephanie Gawroriski	90a9a94257	Update valid extensions to everything in the core info; Disallow libRetro from looking into ZIP files, we will be handling it ourself so that we can load all PRCs and PDBs.	2022-10-02 00:14:01 -04:00
Stephanie Gawroriski	679626b58f	Add build for Mac OS ARM.	2022-10-01 23:41:38 -04:00
Stephanie Gawroriski	1361da0401	Merge pull request #19 from phcoder/patch-1 Fix dingux compilation name	2022-03-17 17:53:24 -04:00
Vladimir Serbinenko	c13324e9c7	Fix dingux compilation name	2022-03-16 06:53:55 +01:00
Stephanie Gawroriski	9d23f9bb67	Merge pull request #18 from crystalct/master PS3/PSL1GHT build fix	2022-02-26 13:42:47 -05:00
CrystalCT	f16e54e879	PS3/PSL1GHT build fix	2022-02-21 13:47:56 +01:00
Stephanie Gawroriski	2954a42bba	Merge pull request #17 from TyroneSlothrop/master Add iOS ARM64 build	2022-01-25 18:16:49 -05:00
Tyrone Slothrop	b066eb856d	Add iOS ARM64 build	2022-01-22 00:25:51 +00:00
Stephanie Gawroriski	be844bf74d	Add pdb to the extensions list.	2021-11-27 10:53:45 -05:00
Stephanie Gawroriski	7ead066572	Update RetroArch core info.	2021-07-16 08:27:07 -04:00
Stephanie Gawroriski	304c0855c1	Add license file; Add Windows icon resource.	2021-07-16 08:03:14 -04:00
Stephanie Gawroriski	932f224580	Add threads to build (needed for mingw-64 POSIX and Linux); Dedication within CMake.	2021-07-15 23:50:01 -04:00
Stephanie Gawroriski	6fd0600446	Add instructions.	2021-07-15 23:40:07 -04:00
Stephanie Gawroriski	ebd397f5ba	Merge branch 'master' of github.com:libretro/Mu	2021-07-15 23:27:50 -04:00
Stephanie Gawroriski	f631649bf7	Bring in the Qt interface into CMake; Fixes for Visual Studio build.	2021-07-15 23:27:00 -04:00
Autechre	5795ade531	Update .gitlab-ci.yml	2021-03-17 15:30:24 +01:00
twinaphex	ff746b8196	Fix MSVC builds - embed MSVCRT runtime	2021-02-14 22:09:34 +01:00
twinaphex	e053b170d2	Add MSVC 2005 / 2010 cores	2021-02-13 01:47:51 +01:00
Autechre	df5a0c63bc	Merge pull request #9 from fjtrujy/PS2NewToolchain [PS2] Update bins for new toolchain	2021-01-15 00:51:48 +01:00
Francisco Javier Trujillo Mata	d93c8c0efc	Update bins for new toolchain	2021-01-15 00:16:07 +01:00
Autechre	62a7f6f2b3	Update .gitlab-ci.yml	2021-01-10 23:34:35 +01:00
Autechre	e4209e1044	Update .gitlab-ci.yml	2021-01-09 16:52:52 +01:00
Autechre	e140a25c5b	Merge pull request #8 from webgeek1234/master Fix multiple definitions of pxa260Framebuffer	2021-01-03 01:16:28 +01:00
Autechre	3d408f3b37	Update .gitlab-ci.yml	2021-01-03 01:16:19 +01:00
Autechre	5a7750163f	Update .gitlab-ci.yml	2021-01-03 01:15:56 +01:00
Aaron Kling	c9af673bf4	Fix multiple definitions of pxa260Framebuffer	2021-01-02 15:48:58 -06:00
Autechre	cb2dcc1740	Update Makefile.libretro	2020-12-29 07:07:42 +01:00
Autechre	bda022c63a	Update Makefile.libretro	2020-12-29 02:37:58 +01:00
Autechre	5022d08ffb	Update .gitlab-ci.yml	2020-12-29 01:41:16 +01:00
Stephanie Gawroriski	95ebb37e5f	Merge branch 'master' of github.com:libretro/Mu	2020-12-28 19:13:43 -05:00
Stephanie Gawroriski	ec3ba7e2cd	Add Wii U.	2020-12-28 19:10:00 -05:00
Autechre	41e0edcaa3	Update .gitlab-ci.yml	2020-12-28 23:47:19 +01:00
Stephanie Gawroriski	223255e2e1	Add Dingux, Nintendo 3DS, Nintendo GameCube, and Nintendo Wii.	2020-12-04 19:18:49 -05:00
Stephanie Gawroriski	1705a0ddd6	Merge pull request #7 from webgeek1234/master libretro: Update gitlab ci extends ordering	2020-12-02 07:41:14 -05:00
Aaron Kling	6ffa4d1d66	libretro: Update gitlab ci extends ordering	2020-12-01 19:25:53 -06:00
Stephanie Gawroriski	9057820fbc	Make sure our include flags are included when compiling C++ code.	2020-11-06 21:21:35 -05:00
Stephanie Gawroriski	254212a229	Define UINTMAX_MAX for PS2.	2020-11-06 21:13:26 -05:00
Stephanie Gawroriski	87c8cfce6b	Correct includes in translators.	2020-11-06 21:03:28 -05:00
Stephanie Gawroriski	96e70d964f	Include standard headers (for PS2).	2020-11-06 20:59:36 -05:00
Stephanie Gawroriski	855504f180	Correct Linux OS build.	2020-11-06 20:57:13 -05:00
Stephanie Gawroriski	6870d8b7ab	Correct includes.	2020-11-06 20:55:05 -05:00
Stephanie Gawroriski	be386ff05d	For CMake disable dynamic recompilation for now.	2020-11-06 20:43:59 -05:00
Stephanie Gawroriski	5a86c5ccf9	Add CMake and re-organize project, keeping includes separated from sources.	2020-11-06 20:29:40 -05:00
Stephanie Gawroriski	3e4829f443	Include missing include.	2020-11-06 18:56:59 -05:00
Stephanie Gawroriski	f6c7944c64	Import PS2 build from SquirrelJME.	2020-11-06 18:54:13 -05:00
Stephanie Gawroriski	d9437c28cb	Correct CI/CD config.	2020-11-06 18:48:03 -05:00
Stephanie Gawroriski	1a6d22086d	Add GitLab CI/CD for RetroArch building.	2020-11-06 18:43:51 -05:00
Stephanie Gawroriski	46b29248dc	Add dedication to Emily, I hope that you are resting in peace.	2020-11-06 18:38:54 -05:00
Stephanie Gawroriski	e7da587071	Remove CircleCI config as it is not used; Add CLion project.	2020-11-06 18:31:08 -05:00
meepingsnesroms	4ac406874c	Merge pull request #97 from meepingsnesroms/tungstenT3Support Remove Android armv5/6	2019-11-29 14:32:57 -08:00
meepingsnesroms	c2ffd5a04a	Remove Android armv5/6	2019-11-29 14:32:11 -08:00
meepingsnesroms	d29d1978ee	Merge pull request #96 from meepingsnesroms/tungstenT3Support Tungsten t3 support	2019-11-29 13:24:04 -08:00
meepingsnesroms	f66e5613b3	Fix lockups in 68K Palm OS	2019-11-27 14:39:55 -08:00
meepingsnesroms	865b1d5f86	More bug info	2019-11-26 18:31:22 -08:00
meepingsnesroms	815f061683	Some fixes	2019-11-26 15:15:19 -08:00
meepingsnesroms	97f8f85021	Make release mode work in QT	2019-11-26 14:06:10 -08:00
meepingsnesroms	e9385a62ab	Update currentBug.txt	2019-11-26 13:06:47 -08:00
meepingsnesroms	b18cc463b6	Update Makefile.common	2019-11-26 12:47:26 -08:00
meepingsnesroms	2ece2d56d4	m500 support working in RetroArch	2019-11-26 12:45:35 -08:00
meepingsnesroms	4738d36119	Finish m500 support	2019-11-26 11:43:00 -08:00
meepingsnesroms	4b836d98db	Update dbvz.c	2019-11-26 10:31:16 -08:00
meepingsnesroms	c8c4539e6f	Clean up gradiant code, make backlight code overflow safe	2019-11-25 23:10:46 -08:00
meepingsnesroms	aed3be3b80	Add backlight for m500, clean up m515 backlight Also backup gradiant code.	2019-11-25 23:00:28 -08:00
meepingsnesroms	c6df0303c8	Fix memory size for m500	2019-11-25 21:14:09 -08:00
meepingsnesroms	126b2cf20f	Clean up and increase safety with multiple device and ROM versions	2019-11-25 20:44:48 -08:00
meepingsnesroms	0c8e6fdebc	m500 booting again	2019-11-25 19:05:33 -08:00
meepingsnesroms	daf0aede3d	Remove sandbox, it was all unused 68k stuff anyway	2019-11-25 18:41:41 -08:00
meepingsnesroms	f768615984	Palm m500 support Part 1, not booting again	2019-11-25 18:25:00 -08:00
meepingsnesroms	c427a607ec	Add basic CPU LCD controller support	2019-11-24 14:58:56 -08:00
meepingsnesroms	aff2d76148	Flush changes	2019-11-21 09:35:48 -08:00
meepingsnesroms	9d41480371	Cleanups and plarity fix for TPS65010 INT pin	2019-11-20 12:09:34 -08:00
meepingsnesroms	de8c733340	Add uARM as reference CPU core	2019-11-20 10:02:38 -08:00
meepingsnesroms	8d386d8027	Add another IDA script	2019-11-16 13:02:12 -08:00
meepingsnesroms	3b009d7131	Clean up logs after so many entrys, log all DAL function calls	2019-11-15 10:54:42 -08:00
meepingsnesroms	c303c7426b	Switch ARMv5 to virtual addresses, they where already used(and the only option) for 68k	2019-11-14 13:27:20 -08:00
meepingsnesroms	0372fdbaff	Can now copy from log output	2019-11-11 16:21:46 -08:00
meepingsnesroms	863cd964bd	Decompiling now supported directly in the emu, cleanups	2019-11-11 15:36:44 -08:00