wrungpo had wrong decryption key

Issue https://github.com/libretro/flycast/issues/1108
(libretro) Move audio batch callback onto main thread + improve audio sample pacing
2026-11-08 17:12:25 -10:00 · 2021-12-17 11:55:17 +01:00 · 2021-12-16 18:21:08 +01:00 · 2021-12-15 23:09:59 +01:00 · 2021-12-15 21:23:35 +01:00 · 2021-12-10 22:20:46 +00:00
7071 changed files with 2166519 additions and 145682 deletions
@@ -0,0 +1,14 @@
+freebsd_instance:
+  image_family: freebsd-13-0
+
+env:
+  CCACHE_DIR: /tmp/ccache
+  CIRRUS_CLONE_SUBMODULES: true
+
+task:
+  install_script: pkg install -y alsa-lib ccache cmake evdev-proto git libao libevdev libudev-devd libzip mesa-libs miniupnpc ninja pkgconf png pulseaudio sdl2
+  ccache_cache:
+    folder: /tmp/ccache
+  script:
+    - cmake -B build -DCMAKE_BUILD_TYPE=Release -G Ninja
+    - cmake --build build --config Release
@@ -0,0 +1 @@
+custom: ['https://utip.io/flyinghead', 'https://www.paypal.com/paypalme/FlycastEmu']
@@ -0,0 +1,41 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Please Note: This form is the minimum required information for submitting bugs.**  
+**Removing this form may lead to your issue being closed until it is completed.**
+
+Platform / OS / Hardware: 
+
+Github hash: 
+
+Hardware: 
+
+**_Description of the Issue_**
+
+Add a short, concise description of the issue here
+
+**_Debugging Steps Tested_**
+
+  * Fill in any steps already tried here
+  * Begin each new line with an asterisk
+  * If no steps are required, please skip
+
+**_Logs Gathered_**
+
+```
+
+Please paste the contents of the log / logs here
+You may leave this field blank if you have none.
+
+```
+
+
+**_Screenshots_**
+
+(Replace this line with any issue screenshots)
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
@@ -0,0 +1,82 @@
+name: Android CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Set up build environment
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install ccache ninja-build
+          echo "CCACHE_DIR=/tmp/ccache" >> $GITHUB_ENV
+
+      # Workaround for https://github.com/actions/virtual-environments/issues/3078
+      - name: Downgrade CMake
+        uses: jwlawson/[email protected]
+        with:
+          cmake-version: '3.19.x'
+
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: true
+
+      - uses: actions/cache@v2
+        with:
+          path: /tmp/ccache
+          key: android-ccache-${{ github.sha }}
+          restore-keys: android-ccache-
+
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: android-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: android-gradle-
+
+      - name: Gradle
+        working-directory: shell/android-studio
+        run: ./gradlew assembleRelease --parallel
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: flycast-release.apk
+          path: shell/android-studio/flycast/build/outputs/apk/release/flycast-release.apk
+
+      - name: Configure AWS Credentials
+        id: aws-credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: AKIAJOZQS4H2PHQWYFCA
+          aws-secret-access-key: ${{ secrets.S3_SECRET_KEY }}
+          aws-region: us-east-2
+        if: github.repository == 'flyinghead/flycast' && github.event_name == 'push'
+
+      - name: Upload to S3
+        run: aws s3 sync shell/android-studio/flycast/build/outputs/apk/release s3://flycast-builds/android/${GITHUB_REF#refs/}-$GITHUB_SHA --acl public-read --exclude='*.json' --follow-symlinks
+        if: ${{ steps.aws-credentials.outputs.aws-account-id != '' }}
+
+      - name: Build dump_syms
+        working-directory: core/deps/breakpad
+        run: |
+          cmake -B build -DCMAKE_BUILD_TYPE=Release -G Ninja
+          cmake --build build --config Release --target dump_syms
+
+      - name: Extract symbols
+        run: |
+          DUMP_SYMS=./core/deps/breakpad/build/dump_syms
+          SO_DIR=shell/android-studio/flycast/build/intermediates/cmake/release/obj
+          for arch in arm64-v8a armeabi-v7a x86 x86_64 ; do
+            $DUMP_SYMS $SO_DIR/$arch/libflycast.so > libflycast.so.sym
+            BUILD_ID=`head -1 libflycast.so.sym | awk '{ print $4 }'`
+            mkdir -p symbols/libflycast.so/$BUILD_ID
+            mv libflycast.so.sym symbols/libflycast.so/$BUILD_ID
+          done
+
+      - name: Upload to S3 (symbols)
+        run: aws s3 sync symbols s3://flycast-symbols/android --follow-symlinks
+        if: ${{ steps.aws-credentials.outputs.aws-account-id != '' }}
@@ -0,0 +1,165 @@
+name: C/C++ CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: ${{ matrix.config.name }}
+    runs-on: ${{ matrix.config.os }}
+
+    strategy:
+      matrix:
+        config:
+          - {name: i686-pc-windows-msvc, os: windows-latest, cmakeArgs: -DCMAKE_SYSTEM_VERSION="10.0.18362.0" -G "Visual Studio 16 2019" -A Win32, buildType: Release}
+          - {name: apple-darwin, os: macos-latest, cmakeArgs: -G "Xcode", destDir: osx, buildType: Release}
+          - {name: apple-ios, os: macos-latest, cmakeArgs: -DCMAKE_SYSTEM_NAME=iOS -G "Xcode", destDir: ios, buildType: Release}
+          - {name: x86_64-pc-linux-gnu, os: ubuntu-latest, buildType: Release}
+          - {name: x86_64-pc-windows-msvc, os: windows-latest, cmakeArgs: -DCMAKE_SYSTEM_VERSION="10.0.18362.0" -G "Visual Studio 16 2019" -A x64, buildType: Release}
+          - {name: x86_64-w64-mingw32, os: windows-latest, cmakeArgs: -G "MinGW Makefiles", destDir: win, buildType: RelWithDebInfo}
+          - {name: libretro-x86_64-pc-linux-gnu, os: ubuntu-latest, cmakeArgs: -DLIBRETRO=ON -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE, buildType: Release}
+          - {name: libretro-x86_64-w64-mingw32, os: windows-latest, cmakeArgs: -DLIBRETRO=ON -G "MinGW Makefiles", buildType: Release}
+
+    steps:
+      - name: Set up build environment (macos-latest)
+        run: |
+          brew install ccache libao libomp pulseaudio zlib ldid
+          echo "/usr/local/opt/ccache/libexec" >> $GITHUB_PATH
+          echo "CCACHE_DIR=/tmp/ccache" >> $GITHUB_ENV
+        if: matrix.config.os == 'macos-latest'
+
+      - name: Set up build environment (ubuntu-latest)
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install ccache libao-dev libasound2-dev libevdev-dev libgl1-mesa-dev libpulse-dev libsdl2-dev libudev-dev libzip-dev libminiupnpc-dev
+          echo "CCACHE_DIR=/tmp/ccache" >> $GITHUB_ENV
+        if: matrix.config.os == 'ubuntu-latest'
+
+      - name: Set up build environment (windows-latest)
+        run: echo "DXSDK_DIR=${Env:HOMEDRIVE}${Env:HOMEPATH}\ccache\" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+        if: matrix.config.os == 'windows-latest' && matrix.config.name != 'libretro-x86_64-w64-mingw32'
+
+      - uses: actions/cache@v2
+        with:
+          path: /tmp/ccache
+          key: ccache-${{ matrix.config.os }}-${{ github.sha }}
+          restore-keys: ccache-${{ matrix.config.os }}-
+        if: matrix.config.os != 'windows-latest'
+
+      - uses: actions/cache@v2
+        id: cache
+        with:
+          path: $HOME/ccache
+          key: ccache-${{ matrix.config.os }}-${{ github.sha }}
+          restore-keys: ccache-${{ matrix.config.os }}-
+        if: matrix.config.os == 'windows-latest'
+
+      - name: Download DX2010
+        if: matrix.config.os == 'windows-latest' && matrix.config.name != 'libretro-x86_64-w64-mingw32'
+        run:   |
+               curl -L https://download.microsoft.com/download/a/e/7/ae743f1f-632b-4809-87a9-aa1bb3458e31/DXSDK_Jun10.exe -o _DX2010_.exe
+               7z x _DX2010_.exe DXSDK/Include -o_DX2010_
+               7z x _DX2010_.exe DXSDK/Lib/x86 -o_DX2010_
+               7z x _DX2010_.exe DXSDK/Lib/x64 -o_DX2010_
+               mv _DX2010_/DXSDK $HOME/ccache
+               rm -fR _DX*_ _DX*_.exe
+        shell: bash
+
+      - name: Install MSYS2
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          install: git base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-breakpad-git
+        if: matrix.config.os == 'windows-latest'
+
+      - name: Downgrade gcc to 10.3
+        run: |
+          pacman -U --noconfirm https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libs-10.3.0-8-any.pkg.tar.zst https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-10.3.0-8-any.pkg.tar.zst https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-ada-10.3.0-8-any.pkg.tar.zst https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-fortran-10.3.0-8-any.pkg.tar.zst https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libgfortran-10.3.0-8-any.pkg.tar.zst https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-objc-10.3.0-8-any.pkg.tar.zst https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-libgccjit-10.3.0-8-any.pkg.tar.zst
+          pacman -U --noconfirm https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-crt-git-9.0.0.6246.ae63cde27-1-any.pkg.tar.zst https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-headers-git-9.0.0.6246.ae63cde27-1-any.pkg.tar.zst https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-libmangle-git-9.0.0.6246.ae63cde27-1-any.pkg.tar.zst https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-libwinpthread-git-9.0.0.6246.ae63cde27-1-any.pkg.tar.zst https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-tools-git-9.0.0.6246.ae63cde27-1-any.pkg.tar.zst https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-winpthreads-git-9.0.0.6246.ae63cde27-1-any.pkg.tar.zst https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-winstorecompat-git-9.0.0.6246.ae63cde27-1-any.pkg.tar.zst
+          pacman -U --noconfirm https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-cmake-3.20.5-2-any.pkg.tar.zst
+        shell: msys2 {0}
+        if: matrix.config.os == 'windows-latest'
+
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: true
+
+      - name: Create artifact directory
+        run: mkdir -p build/artifact
+
+      - name: Build SDL (macos)
+        run: |
+          cd shell/apple
+          mkdir artifacts
+          brew install --build-from-source ./sdl2.rb
+        if: matrix.config.name == 'apple-darwin'
+
+      - name: CMake
+        run: |
+          cmake -B build -DCMAKE_BUILD_TYPE=${{ matrix.config.buildType }} -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=artifact -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=artifact ${{ matrix.config.cmakeArgs }}
+          cmake --build build --config Release --parallel 2
+        if: matrix.config.os != 'windows-latest'
+
+      - name: CMake (windows)
+        shell: msys2 {0}
+        run: |
+          unset temp tmp
+          cmake -B build -DCMAKE_BUILD_TYPE=${{ matrix.config.buildType }} -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=artifact -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO=artifact -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=artifact ${{ matrix.config.cmakeArgs }}
+          cmake --build build --config Release --parallel 2
+        if: matrix.config.os == 'windows-latest'
+
+      - name: Unit Tests
+        run: |
+          mkdir -p build/tests
+          cmake -B build -DCMAKE_BUILD_TYPE=${{ matrix.config.buildType }} -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=tests -DENABLE_CTEST=ON ${{ matrix.config.cmakeArgs }}
+          cmake --build build --config Release --parallel 2
+          ./build/tests/flycast
+        if: matrix.config.name == 'x86_64-pc-linux-gnu'
+
+      - name: Dump symbols
+        shell: msys2 {0}
+        run: |
+          dump_syms build/artifact/flycast.exe > flycast.exe.sym 2>/dev/null
+          BUILD_ID=`head -1 flycast.exe.sym | awk '{ print $4 }'`
+          mkdir -p symbols/flycast.exe/$BUILD_ID
+          mv flycast.exe.sym symbols/flycast.exe/$BUILD_ID
+          strip build/artifact/flycast.exe
+        if: matrix.config.name == 'x86_64-w64-mingw32'
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: flycast-${{ matrix.config.name }}
+          path: build/artifact
+
+      - name: Package app (macos)
+        run: |
+          cd build/artifact
+          rm -rf Flycast.swiftmodule
+          zip -r flycast.app.zip Flycast.app
+          rm -rf Flycast.app
+        if: matrix.config.name == 'apple-darwin'
+
+      - name: Package app (windows)
+        run: |
+          powershell Compress-Archive build/artifact/flycast.exe build/artifact/flycast.zip 
+          rm build/artifact/flycast.exe
+        if: matrix.config.name == 'x86_64-w64-mingw32'
+
+      - name: Configure AWS Credentials
+        id: aws-credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: AKIAJOZQS4H2PHQWYFCA
+          aws-secret-access-key: ${{ secrets.S3_SECRET_KEY }}
+          aws-region: us-east-2
+        if: github.repository == 'flyinghead/flycast' && github.event_name == 'push' && matrix.config.destDir != ''
+
+      - name: Upload to S3
+        run: aws s3 sync build/artifact s3://flycast-builds/${{ matrix.config.destDir }}/${GITHUB_REF#refs/}-$GITHUB_SHA --acl public-read --follow-symlinks
+        shell: bash
+        if: ${{ steps.aws-credentials.outputs.aws-account-id != '' }}
+
+      - name: Upload symbols to S3
+        run: aws s3 sync symbols s3://flycast-symbols/${{ matrix.config.destDir }} --follow-symlinks
+        if: ${{ steps.aws-credentials.outputs.aws-account-id != '' && matrix.config.os == 'windows-latest' }}
+        
@@ -0,0 +1,33 @@
+# Prepare source texts & upload them to Crowdin
+
+name: Crowdin Source Texts Upload
+
+# on change to the English texts
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - 'shell/libretro/libretro_core_options.h'
+
+jobs:
+  upload_source_file:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Java JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Setup Python
+        uses: actions/setup-python@v2
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Upload Source
+        shell: bash
+        env:
+          CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
+        run: |
+          python3 intl/upload_workflow.py $CROWDIN_API_KEY "flyinghead-flycast" "shell/libretro/libretro_core_options.h"
@@ -0,0 +1,46 @@
+# Download translations form Crowdin & Recreate libretro_core_options_intl.h
+
+name: Crowdin Translation Integration
+
+on:
+  schedule:
+  # please choose a random time & weekday to avoid all repos synching at the same time
+    - cron: '15 22 * * 5'  # Fridays at 10:15 PM, UTC
+
+jobs:
+  create_intl_file:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Java JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Setup Python
+        uses: actions/setup-python@v2
+
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal access token.
+          fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository.
+
+      - name: Create intl file
+        shell: bash
+        env:
+          CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
+        run: |
+          python3 intl/download_workflow.py $CROWDIN_API_KEY "flyinghead-flycast" "shell/libretro/libretro_core_options_intl.h"
+
+      - name: Commit files
+        run: |
+          git config --local user.email "[email protected]"
+          git config --local user.name "github-actions[bot]"
+          git add intl/*_workflow.py "shell/libretro/libretro_core_options_intl.h"
+          git commit -m "Fetch translations & Recreate libretro_core_options_intl.h"
+
+      - name: GitHub Push
+        uses: ad-m/[email protected]
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: ${{ github.ref }}
@@ -0,0 +1,59 @@
+name: Nintendo Switch CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: ${{ matrix.config.name }}
+    runs-on: ubuntu-latest
+    container: devkitpro/devkita64:latest
+
+    strategy:
+      matrix:
+        config:
+          - {name: standalone, destDir: switch}
+          - {name: libretro, cmakeArgs: -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=artifact -DLIBRETRO=ON}
+
+    steps:
+      - name: Set up build environment
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install awscli ninja-build
+
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: true
+
+      - name: CMake
+        run: |
+          $DEVKITPRO/portlibs/switch/bin/aarch64-none-elf-cmake -B build -DCMAKE_BUILD_TYPE=Release -G Ninja ${{ matrix.config.cmakeArgs }}
+          cmake --build build --config Release
+
+      - name: Prepare upload
+        run: |
+          mkdir build/artifact
+          mv build/flycast.nro build/artifact/flycast.nro
+        if: hashFiles('build/flycast.nro') != ''
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: flycast-switch-${{ matrix.config.name }}
+          path: build/artifact
+
+      - name: Package app
+        run: zip -m build/artifact/flycast.nro.zip build/artifact/flycast.nro
+        if: hashFiles('build/artifact/flycast.nro') != ''
+
+      - name: Configure AWS Credentials
+        id: aws-credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: AKIAJOZQS4H2PHQWYFCA
+          aws-secret-access-key: ${{ secrets.S3_SECRET_KEY }}
+          aws-region: us-east-2
+        if: github.repository == 'flyinghead/flycast' && github.event_name == 'push' && matrix.config.destDir != ''
+
+      - name: Upload to S3
+        run: aws s3 sync build/artifact s3://flycast-builds/${{ matrix.config.destDir }}/${GITHUB_REF#refs/}-$GITHUB_SHA --acl public-read --follow-symlinks
+        if: ${{ steps.aws-credentials.outputs.aws-account-id != '' }}
@@ -1,10 +1,12 @@
+build/
+
+# macOS
 .DS_Store
-*.class
-*.orig

-bin/
-gen/
-obj/
+# Visual Studio
+.vs/
+out/

-newdc/android/libnewdc/bin/libnewdc.jar
-newdc/android/libnewdc/bin/classes/com/example/newdc/JNIdc.class
+# JetBrains IDES
+.idea/
+cmake-build-*/
@@ -0,0 +1,118 @@
+# DESCRIPTION: GitLab CI/CD for libRetro (NOT FOR GitLab-proper)
+
+##############################################################################
+################################# BOILERPLATE ################################
+##############################################################################
+
+# Core definitions
+.core-defs:
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
+    CORENAME: flycast
+    CORE_ARGS: -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release
+
+.core-defs-linux:
+  extends: .core-defs
+  variables:
+    CORE_ARGS: -DLIBRETRO=ON -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_BUILD_TYPE=Release
+
+.core-defs-osx-x64:
+  extends: .core-defs
+  variables:
+    CORE_ARGS: -DLIBRETRO=ON -G Xcode -DCMAKE_BUILD_TYPE=Release
+    EXTRA_PATH: Release
+
+.core-defs-android:
+  extends: .core-defs
+  script:
+    - cmake $CORE_ARGS -DANDROID_PLATFORM=android-$API_LEVEL -DCMAKE_TOOLCHAIN_FILE=$NDK_ROOT/build/cmake/android.toolchain.cmake -DANDROID_STL=c++_static -DANDROID_ABI=$ANDROID_ABI -DANDROID_ARM_MODE=arm "$CMAKE_SOURCE_ROOT" -B$BUILD_DIR
+    - cmake --build $BUILD_DIR --target ${CORENAME}_libretro --config Release -- -j $NUMPROC
+    - mv $BUILD_DIR/${CORENAME}_libretro.so $LIBNAME
+    - if [ $STRIP_CORE_LIB -eq 1 ]; then $NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip $LIBNAME; fi
+  variables:
+    API_LEVEL: 18
+
+# Inclusion templates, required for the build to work
+include:
+  ################################## DESKTOPS ################################
+  # Windows
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/windows-cmake-mingw.yml'
+
+  # MacOS
+  - project: 'libretro-infrastructure/ci-templates'
+    file: 'osx-cmake-x86.yml'
+
+  # Linux
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/linux-cmake.yml'
+
+  ################################## CELLULAR ################################
+  # Android
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/android-cmake.yml'
+
+# Stages for building
+stages:
+  - build-prepare
+  - build-shared
+
+##############################################################################
+#################################### STAGES ##################################
+##############################################################################
+#
+################################### DESKTOPS #################################
+# Windows 64-bit
+libretro-build-windows-x64:
+  extends:
+    - .libretro-windows-cmake-x86_64
+    - .core-defs
+
+# Windows 32-bit
+libretro-build-windows-i686:
+  extends:
+    - .libretro-windows-cmake-x86
+    - .core-defs
+
+# Linux 64-bit
+libretro-build-linux-x64:
+  extends:
+    - .libretro-linux-cmake-x86_64
+    - .core-defs-linux
+
+# Linux 32-bit
+libretro-build-linux-i686:
+  extends:
+    - .libretro-linux-cmake-x86
+    - .core-defs-linux
+
+# MacOS 64-bit
+libretro-build-osx-x64:
+  extends:
+    - .libretro-osx-cmake-x86
+    - .core-defs-osx-x64
+
+################################### CELLULAR #################################
+# Android ARMv7a
+android-armeabi-v7a:
+  extends:
+    - .libretro-android-cmake-armeabi-v7a
+    - .core-defs-android
+
+# Android ARMv8a
+android-arm64-v8a:
+  extends:
+    - .libretro-android-cmake-arm64-v8a
+    - .core-defs-android
+
+# Android 64-bit x86
+android-x86_64:
+  extends:
+    - .libretro-android-cmake-x86_64
+    - .core-defs-android
+
+# Android 32-bit x86
+android-x86:
+  extends:
+    - .libretro-android-cmake-x86
+    - .core-defs-android
@@ -0,0 +1,6 @@
+[submodule "core/deps/SDL"]
+	path = core/deps/SDL
+	url = https://github.com/libsdl-org/SDL.git
+[submodule "core/deps/libchdr"]
+	path = core/deps/libchdr
+	url = https://github.com/rtissera/libchdr.git
@@ -1,84 +1,37 @@
-reicast
-===========
-reicast is a sega dreamcast emulator
+# Flycast

-This is developer oriented resource, if you just want bins head over to http://reicast.com
+[![Android CI](https://github.com/flyinghead/flycast/actions/workflows/android.yml/badge.svg)](https://github.com/flyinghead/flycast/actions/workflows/android.yml)
+[![C/C++ CI](https://github.com/flyinghead/flycast/actions/workflows/c-cpp.yml/badge.svg)](https://github.com/flyinghead/flycast/actions/workflows/c-cpp.yml)
+[![Nintendo Switch CI](https://github.com/flyinghead/flycast/actions/workflows/switch.yml/badge.svg)](https://github.com/flyinghead/flycast/actions/workflows/switch.yml)

-Caution
-------
-The source is a mess, and I need sleep.
-We had to discover some interesting arm bugs on the cleaned/refactored branch right after the release.
-Expect a much improved changed folder/make structure soon.
+![flycast logo](https://github.com/flyinghead/flycast/raw/master/shell/linux/flycast.png)

-Rebranding/forks
----------------
-If you are interested into further porting/adapting/whatever, *please* don't fork off. I hate that. Really.
+**Flycast** is a multi-platform Sega Dreamcast, Naomi and Atomiswave emulator derived from [**reicast**](https://reicast.com/).

-Let's try to keep everything under a single project :)
+Information about configuration and supported features can be found on [**TheArcadeStriker's flycast wiki**](https://github.com/TheArcadeStriker/flycast-wiki/wiki).

-To build for android
--------------------
-Tools required:
-* Latest Android SDK and NDK (duh)
-* Ant
+Join us on our [**Discord server**](https://discord.gg/X8YWP8w) for a chat. 

-From project root directory:
-```
-cd shell\android
-android update project -p .
+## Install

-ndk-build -j 4
+### Flatpak

-ant debug
-```
+1. [Set up Flatpak](https://www.flatpak.org/setup/)

-Beta versions
-------------------
-Compiled test versions are available at recast.loungekatt.com
+2. Install Flycast from [Flathub](https://flathub.org/apps/details/org.flycast.Flycast)

-Donations and stuff
-------------------
-Well, glad you liked the project so far!
+`flatpak install -y org.flycast.Flycast`

-We're currently short on hardware
+3. Run Flycast

-If you would like to donate some devices, get in touch at team@reicast.com. GLES3 capable stuff, some mainstream hardware and rarities would be extremely appreciated.
-Keep in mind we're located in Greece for the most part
+`flatpak run org.flycast.Flycast`

-This has been tested/developed on
-* Galaxy tab 7.0 Plus
-* LG P990
-* Archos 10G9
-* Some Chinese tablet
-* OUYA
-* Various development boards
-* gcw zero
+### Binaries

-We had to buy all of these, except the gcw zero and a beaglebone which were donated (thanks! You rock!)
+Get fresh builds for your system [on the builds page](https://flyinghead.github.io/flycast-builds/).

-Apart from that, we don't accept monetary donations right now.
-We also don't plan to be releasing a premium version at any store.
-Most of the project has been developed by drk||Raziel (aka, skmp, drk, Raz, etc) but it has been based on the 
-works of multiple people. It would be extremely unfair to charge for it and get all the credit :)
+**New:** Now automated test results are available as well.

+## Disclaimer

-We're planning for an indiegogo campaign later on to help with sustained development and running costs, so follow @reicastdc on twitter for updates
-
-
-Team
----
-
-You can check the currently active committers on [the pretty graphs page](https://github.com/reicast/reicast-emulator/graphs/contributors)
-
-Chat on freenode #reicast. 
-
-The original reicast team consisted of drk||Raziel (mostly just writing code), PsyMan (debugging/testing and everything else) and a little bit of gb_away
-
-
-Special thanks
--------------
-In previous iterations a lot of people have worked on this, notably David Miller (aka, ZeZu), the nullDC team, friends from #pcsx2 and all over the world :)
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/reicast/reicast-emulator/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-
+All code contributed to this fork is *not* bound by the Individual Contributor License Agreement of the upstream repository (https://github.com/reicast/reicast-emulator) and shall *not* be considered as a contribution to the upstream repository.
@@ -0,0 +1 @@
+/version.h
@@ -1,4 +1,17 @@
-newdc
+# core
 ===========

-The core of the emulator
+Here lies the core of our codebase. Everything that's OS inspecific rests here.
+** Please check per directory README for more info **
+
+### Some rudimentary categories are:
+- hw				  -- DC Hardware Components Implementation
+- nullDC.cpp	-- Main entry points
+- khronos			-- OpenGL and Vulkan headers
+- oslib				-- Audio drivers
+- cfg				  -- Configuration backend structure
+- reios				-- (Our) Implementation of the DreamCast BIOS
+- deps				-- External dependencies
+- imgread			-- Content drivers
+- rec-*				-- Recompilers
+- rend				-- OpenGL and Vulkan renderers
@@ -0,0 +1,134 @@
+/*
+    Created on: Nov 22, 2018
+
+	Copyright 2018 flyinghead
+
+	This file is part of reicast.
+
+    reicast is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    reicast is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with reicast.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#include "7zArchive.h"
+#include "deps/lzma/7z.h"
+#include "deps/lzma/7zCrc.h"
+#include "deps/lzma/Alloc.h"
+
+#define kInputBufSize ((size_t)1 << 18)
+
+static bool crc_tables_generated;
+
+bool SzArchive::Open(const char* path)
+{
+	SzArEx_Init(&szarchive);
+
+	File_Close(&archiveStream.file);
+	File_Construct(&archiveStream.file);
+#ifdef USE_WINDOWS_FILE
+	nowide::wstackstring wpath;
+	if (!wpath.convert(path))
+		return false;
+	archiveStream.file.handle = CreateFileW(wpath.c_str(),
+			GENERIC_READ, FILE_SHARE_READ, NULL,
+			OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	if (archiveStream.file.handle == INVALID_HANDLE_VALUE)
+		return false;
+#else
+	archiveStream.file.file = nowide::fopen(path, "rb");
+	if (archiveStream.file.file == nullptr)
+		return false;
+#endif
+	FileInStream_CreateVTable(&archiveStream);
+	LookToRead2_CreateVTable(&lookStream, 0);
+	lookStream.buf = (Byte *)ISzAlloc_Alloc(&g_Alloc, kInputBufSize);
+	if (lookStream.buf == NULL)
+	{
+		File_Close(&archiveStream.file);
+		return false;
+	}
+	lookStream.bufSize = kInputBufSize;
+	lookStream.realStream = &archiveStream.vt;
+	LookToRead2_Init(&lookStream);
+
+	if (!crc_tables_generated)
+	{
+		CrcGenerateTable();
+		crc_tables_generated = true;
+	}
+	SRes res = SzArEx_Open(&szarchive, &lookStream.vt, &g_Alloc, &g_Alloc);
+
+	return (res == SZ_OK);
+}
+
+ArchiveFile* SzArchive::OpenFile(const char* name)
+{
+	u16 fname[512];
+	for (UInt32 i = 0; i < szarchive.NumFiles; i++)
+	{
+		if (SzArEx_IsDir(&szarchive, i))
+			continue;
+
+		size_t len = SzArEx_GetFileNameUtf16(&szarchive, i, fname);
+		char szname[512];
+		size_t j = 0;
+		for (; j < len && j < sizeof(szname) - 1; j++)
+			szname[j] = fname[j];
+		szname[j] = 0;
+		if (strcmp(name, szname))
+			continue;
+
+		size_t offset = 0;
+		size_t out_size_processed = 0;
+		SRes res = SzArEx_Extract(&szarchive, &lookStream.vt, i, &block_idx, &out_buffer, &out_buffer_size, &offset, &out_size_processed, &g_Alloc, &g_Alloc);
+		if (res != SZ_OK)
+			return NULL;
+
+		return new SzArchiveFile(out_buffer, offset, (u32)out_size_processed);
+	}
+	return NULL;
+}
+
+ArchiveFile* SzArchive::OpenFileByCrc(u32 crc)
+{
+	if (crc == 0)
+		return NULL;
+	for (UInt32 i = 0; i < szarchive.NumFiles; i++)
+	{
+		unsigned isDir = SzArEx_IsDir(&szarchive, i);
+		if (isDir)
+			continue;
+
+		if (crc != szarchive.CRCs.Vals[i])
+			continue;
+
+		size_t offset = 0;
+		size_t out_size_processed = 0;
+		SRes res = SzArEx_Extract(&szarchive, &lookStream.vt, i, &block_idx, &out_buffer, &out_buffer_size, &offset, &out_size_processed, &g_Alloc, &g_Alloc);
+		if (res != SZ_OK)
+			return NULL;
+
+		return new SzArchiveFile(out_buffer, offset, (u32)out_size_processed);
+	}
+	return NULL;
+}
+
+SzArchive::~SzArchive()
+{
+	if (lookStream.buf != NULL)
+	{
+		File_Close(&archiveStream.file);
+		ISzAlloc_Free(&g_Alloc, lookStream.buf);
+		if (out_buffer != NULL)
+			ISzAlloc_Free(&g_Alloc, out_buffer);
+		SzArEx_Free(&szarchive, &g_Alloc);
+	}
+}
@@ -0,0 +1,68 @@
+/*
+    Created on: Nov 23, 2018
+
+	Copyright 2018 flyinghead
+
+	This file is part of reicast.
+
+    reicast is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    reicast is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with reicast.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "archive.h"
+#include "deps/lzma/7z.h"
+#include "deps/lzma/7zFile.h"
+
+#include <algorithm>
+
+class SzArchive : public Archive
+{
+public:
+	SzArchive() : out_buffer(NULL) {
+		memset(&archiveStream, 0, sizeof(archiveStream));
+		memset(&lookStream, 0, sizeof(lookStream));
+	}
+	~SzArchive() override;
+
+	ArchiveFile* OpenFile(const char* name) override;
+	ArchiveFile *OpenFileByCrc(u32 crc) override;
+
+private:
+	bool Open(const char* path) override;
+
+	CSzArEx szarchive;
+	UInt32 block_idx;				/* it can have any value before first call (if outBuffer = 0) */
+	Byte *out_buffer;				/* it must be 0 before first call for each new archive. */
+	size_t out_buffer_size;			/* it can have any value before first call (if outBuffer = 0) */
+	CFileInStream archiveStream;
+	CLookToRead2 lookStream;
+
+};
+
+class SzArchiveFile : public ArchiveFile
+{
+public:
+	SzArchiveFile(u8 *data, u32 offset, u32 length) : data(data), offset(offset), length(length) {}
+	u32 Read(void *buffer, u32 length) override
+	{
+		length = std::min(length, this->length);
+		memcpy(buffer, data + offset, length);
+		return length;
+	}
+
+private:
+	u8 *data;
+	u32 offset;
+	u32 length;
+};
@@ -0,0 +1,90 @@
+/*
+    Created on: Nov 23, 2018
+
+	Copyright 2018 flyinghead
+
+	This file is part of reicast.
+
+    reicast is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    reicast is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with reicast.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#include "ZipArchive.h"
+
+ZipArchive::~ZipArchive()
+{
+	zip_close(zip);
+}
+
+bool ZipArchive::Open(const char* path)
+{
+	FILE *file = nowide::fopen(path, "rb");
+	if (file == nullptr)
+		return false;
+	zip_error_t error;
+	zip_source_t *source = zip_source_filep_create(file, 0, -1, &error);
+	if (source == nullptr)
+	{
+		std::fclose(file);
+		return false;
+	}
+	zip = zip_open_from_source(source, 0, NULL);
+	if (zip == nullptr)
+		zip_source_free(source);
+	return zip != nullptr;
+}
+
+ArchiveFile* ZipArchive::OpenFile(const char* name)
+{
+	zip_file *zip_file = zip_fopen(zip, name, 0);
+	if (zip_file == NULL)
+		return NULL;
+
+	return new ZipArchiveFile(zip_file);
+}
+
+struct zip_file *zip_fopen_by_crc(struct zip *za, u32 crc, int flags)
+{
+    int i, n;
+    struct zip_stat stat;
+
+    if (crc == 0) {
+        return NULL;
+    }
+
+    n = zip_get_num_files(za);
+    for (i = 0; i < n; i++) {
+        if (zip_stat_index(za, i, flags, &stat) < -1) {
+            return NULL;
+        }
+
+        if (stat.crc == crc) {
+            return zip_fopen_index(za, i, flags);
+        }
+    }
+
+    return NULL;
+}
+
+ArchiveFile* ZipArchive::OpenFileByCrc(u32 crc)
+{
+	zip_file *zip_file = zip_fopen_by_crc(zip, crc, 0);
+	if (zip_file == NULL)
+		return NULL;
+
+	return new ZipArchiveFile(zip_file);
+}
+
+u32 ZipArchiveFile::Read(void* buffer, u32 length)
+{
+	return zip_fread(zip_file, buffer, length);
+}
@@ -0,0 +1,50 @@
+/*
+    Created on: Nov 23, 2018
+
+	Copyright 2018 flyinghead
+
+	This file is part of reicast.
+
+    reicast is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    reicast is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with reicast.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "archive.h"
+#include <zip.h>
+
+class ZipArchive : public Archive
+{
+public:
+	ZipArchive() : zip(NULL) {}
+	~ZipArchive() override;
+
+	ArchiveFile* OpenFile(const char* name) override;
+	ArchiveFile* OpenFileByCrc(u32 crc) override;
+
+private:
+	bool Open(const char* path) override;
+
+	struct zip *zip;
+};
+
+class ZipArchiveFile : public ArchiveFile
+{
+public:
+	ZipArchiveFile(struct zip_file *zip_file) : zip_file(zip_file) {}
+	~ZipArchiveFile() override { zip_fclose(zip_file); }
+	u32 Read(void* buffer, u32 length) override;
+
+private:
+	struct zip_file *zip_file;
+};
@@ -0,0 +1,45 @@
+/*
+    Created on: Nov 23, 2018
+
+	Copyright 2018 flyinghead
+
+	This file is part of reicast.
+
+    reicast is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    reicast is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with reicast.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "archive.h"
+#include "7zArchive.h"
+#include "ZipArchive.h"
+
+Archive *OpenArchive(const char *path)
+{
+	std::string base_path(path);
+
+	Archive *sz_archive = new SzArchive();
+	if (sz_archive->Open(base_path.c_str()) || sz_archive->Open((base_path + ".7z").c_str()) || sz_archive->Open((base_path + ".7Z").c_str()))
+		return sz_archive;
+	delete sz_archive;
+
+	Archive *zip_archive = new ZipArchive();
+	if (zip_archive->Open(base_path.c_str()) || zip_archive->Open((base_path + ".zip").c_str()) || zip_archive->Open((base_path + ".ZIP").c_str()))
+		return zip_archive;
+	delete zip_archive;
+
+	return NULL;
+}
+
+
+
+
@@ -0,0 +1,45 @@
+/*
+    Created on: Nov 23, 2018
+
+	Copyright 2018 flyinghead
+
+	This file is part of reicast.
+
+    reicast is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    reicast is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with reicast.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "types.h"
+
+class ArchiveFile
+{
+public:
+	virtual ~ArchiveFile() = default;
+	virtual u32 Read(void *buffer, u32 length) = 0;
+};
+
+class Archive
+{
+public:
+	virtual ~Archive() = default;
+	virtual ArchiveFile *OpenFile(const char *name) = 0;
+	virtual ArchiveFile *OpenFileByCrc(u32 crc) = 0;
+
+	friend Archive *OpenArchive(const char *path);
+
+private:
+	virtual bool Open(const char *name) = 0;
+};
+
+Archive *OpenArchive(const char *path);
@@ -0,0 +1,151 @@
+/*
+	Copyright 2020 flyinghead
+
+	This file is part of Flycast.
+
+    Flycast is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Flycast is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
+*/
+#include "rzip.h"
+#include <zlib.h>
+
+const u8 RZipHeader[8] = { '#', 'R', 'Z', 'I', 'P', 'v', 1, '#' };
+
+bool RZipFile::Open(const std::string& path, bool write)
+{
+	verify(file == nullptr);
+
+	file = nowide::fopen(path.c_str(), write ? "wb" : "rb");
+	if (file == nullptr)
+		return false;
+	if (!write)
+	{
+		u8 header[sizeof(RZipHeader)];
+		if (std::fread(header, sizeof(header), 1, file) != 1
+			|| memcmp(header, RZipHeader, sizeof(header))
+			|| std::fread(&maxChunkSize, sizeof(maxChunkSize), 1, file) != 1
+			|| std::fread(&size, sizeof(size), 1, file) != 1)
+		{
+			Close();
+			return false;
+		}
+		// savestates created on 32-bit platforms used to have a 32-bit size
+		if (size >> 32 != 0)
+		{
+			size &= 0xffffffff;
+			std::fseek(file, -4, SEEK_CUR);
+		}
+		chunk = new u8[maxChunkSize];
+		chunkIndex = 0;
+		chunkSize = 0;
+	}
+
+	return true;
+}
+
+void RZipFile::Close()
+{
+	if (file != nullptr)
+	{
+		std::fclose(file);
+		file = nullptr;
+		if (chunk != nullptr)
+		{
+			delete [] chunk;
+			chunk = nullptr;
+		}
+	}
+}
+
+size_t RZipFile::Read(void *data, size_t length)
+{
+	verify(file != nullptr);
+
+	u8 *p = (u8 *)data;
+	size_t rv = 0;
+	while (rv < length)
+	{
+		if (chunkIndex == chunkSize)
+		{
+			chunkSize = 0;
+			chunkIndex = 0;
+			u32 zippedSize;
+			if (std::fread(&zippedSize, sizeof(zippedSize), 1, file) != 1)
+				break;
+			if (zippedSize == 0)
+				continue;
+			u8 *zipped = new u8[zippedSize];
+			if (std::fread(zipped, zippedSize, 1, file) != 1)
+			{
+				delete [] zipped;
+				break;
+			}
+			uLongf tl = maxChunkSize;
+			if (uncompress(chunk, &tl, zipped, zippedSize) != Z_OK)
+			{
+				delete [] zipped;
+				break;
+			}
+			delete [] zipped;
+			chunkSize = (u32)tl;
+		}
+		u32 l = std::min(chunkSize - chunkIndex, (u32)length);
+		memcpy(p, chunk + chunkIndex, l);
+		p += l;
+		chunkIndex += l;
+		rv += l;
+	}
+
+	return rv;
+}
+
+size_t RZipFile::Write(const void *data, size_t length)
+{
+	verify(file != nullptr);
+	verify(std::ftell(file) == 0);
+
+	maxChunkSize = 1024 * 1024;
+	size = length;
+	if (std::fwrite(RZipHeader, sizeof(RZipHeader), 1, file) != 1
+		|| std::fwrite(&maxChunkSize, sizeof(maxChunkSize), 1, file) != 1
+		|| std::fwrite(&size, sizeof(size), 1, file) != 1)
+		return 0;
+	const u8 *p = (const u8 *)data;
+	// compression output buffer must be 0.1% larger + 12 bytes
+	uLongf maxZippedSize = maxChunkSize + maxChunkSize / 1000 + 12;
+	u8 *zipped = new u8[maxZippedSize];
+	size_t rv = 0;
+	while (rv < length)
+	{
+		uLongf zippedSize = maxZippedSize;
+		uLongf uncompressedSize = std::min(maxChunkSize, (u32)(length - rv));
+		u32 rc = compress(zipped, &zippedSize, p, uncompressedSize);
+		if (rc != Z_OK)
+		{
+			WARN_LOG(SAVESTATE, "Compression error: %d", rc);
+			break;
+		}
+		u32 sz = (u32)zippedSize;
+		if (std::fwrite(&sz, sizeof(sz), 1, file) != 1
+			|| std::fwrite(zipped, zippedSize, 1, file) != 1)
+		{
+			rv = 0;
+			break;
+		}
+		p += uncompressedSize;
+		rv += uncompressedSize;
+	}
+	delete [] zipped;
+	
+	return rv;
+}
@@ -0,0 +1,43 @@
+/*
+	Copyright 2020 flyinghead
+
+	This file is part of Flycast.
+
+    Flycast is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Flycast is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
+*/
+// Implementation of the RZIP stream format as defined by libretro
+// https://github.com/libretro/libretro-common/blob/master/include/streams/rzip_stream.h
+
+#pragma once
+#include "types.h"
+
+class RZipFile
+{
+public:
+	~RZipFile() { Close(); }
+
+	bool Open(const std::string& path, bool write);
+	void Close();
+	size_t Size() const { return size; }
+	size_t Read(void *data, size_t length);
+	size_t Write(const void *data, size_t length);
+
+private:
+	FILE *file = nullptr;
+	u64 size = 0;
+	u32 maxChunkSize = 0;
+	u8 *chunk = nullptr;
+	u32 chunkSize = 0;
+	u32 chunkIndex = 0;
+};
@@ -1,83 +0,0 @@
-/*
- *	E_Branches.h
- *
- */
-#pragma once
-
-
-
-namespace ARM
-{	
-	
-	EAPI B(u32 sImm24, ConditionCode CC=AL)
-	{
-		DECL_Id(0x0A000000);
-
-		SET_CC;
-		I |= ((sImm24>>2)&0xFFFFFF);
-		EMIT_I;
-	}
-
-	EAPI BL(u32 sImm24, ConditionCode CC=AL)
-	{
-		DECL_Id(0x0B000000);
-
-		SET_CC;
-		I |= ((sImm24>>2)&0xFFFFFF);
-		EMIT_I;
-	}
-	
-
-	// Note: Either X variant will switch to THUMB* if bit0 of addr is 1
-	//
-
-	EAPI BX(eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x012FFF10);
-
-		SET_CC;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	EAPI BLX(eReg Rm, ConditionCode CC=AL)   // Form II
-	{
-		DECL_Id(0x012FFF30);
-
-		SET_CC;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	EAPI BXJ(eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x012FFF20);
-
-		SET_CC;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-
-	
-
-	// This encoding looks correct,  but segfaults,  the pc val is align(pc,4) but this should be right in ARM
-	//
-#if defined(_DEVEL)
-	EAPI BLX(u32 sImm24)   // Form I     * H is derived so not needed, fixup sImm24 so one can just pass a real addr
-	{
-		DECL_Id(0xFA000000);
-
-		//if(sImm24&1)
-		//    I |= 1<<24; // SET_H
-
-		I |= ((sImm24>>2)&0xFFFFFF);
-		EMIT_I;
-	}
-#endif
-
-
-
-
-
-};
@@ -1,844 +0,0 @@
-/*
- *	<E_DataOp.h		Title="ARMv7 ISA Emitter Middle-ware:	Data-Processing Instructions"	/>
- *
- *	<?CTYPE
- *
- *	<opcode1>{<cond>}{S} <Rd>, <shifter_operand>
- *	<opcode1> := MOV | MVN
- *
- *	<opcode2>{<cond>} <Rn>, <shifter_operand>
- *	<opcode2> := CMP | CMN | TST | TEQ
- *
- *	<opcode3>{<cond>}{S} <Rd>, <Rn>, <shifter_operand>
- *	<opcode3> := ADD | SUB | RSB | ADC | SBC | RSC | AND | BIC | EOR | ORR
- *
- *	?/>
- */
-#pragma once
-
-
-
-namespace ARM
-{
-	
-	
-	
-	
-	
-	
-	
-	/*
-	 *	imm				Rd,[Rn,] imm
-	 *	reg				Rd,Rn,Rm shift
-	 *	rsr				Rd,Rn,Rm type Rs
-	 *
-	 * sp.imm			Rd {SP} imm
-	 * sp.reg			Rd {SP} Rm shift
-	 *
-	 */
-	
-	
-#if 0
-#define dpInstr(iName, iId)	\
-		EAPI iName (eReg Rd, eReg Rn, u32 Imm)	;	\
-		EAPI iName (eReg Rd, eReg Rn, eReg Rm, eShiftOp type=S_LSL, u32 Imm=0)	;	\
-		EAPI iName (eReg Rd, eReg Rn, eReg Rm, eShiftOp type, eReg Rs)	;
-#endif	
-	
-	/*
-	
-	ADC	IMM	0x02A00000
-	ADC REG	0x00A00000
-	ADC RSR	0x00A00010
-	
-	ADD IMM	0x02800000
-	ADD REG	0x00800000
-	ADD RSR 0x00800010
-ADD.SP.IMM	0x028D0000
-ADD.SP.REG	0x008D0000
-	
-	AND IMM	0x02000000
-	AND REG	0x00000000
-	AND RSR	0x00000010
-	
-	
-//	ASR's do not fit this pattern moved elsewhere	//
-	
-	
-	
-	BIC IMM	0x03C00000
-	BIC REG 0x01C00000
-	BIC RSR 0x01C00010
-	
-	CMN IMM	0x03700000		// N imm
-	CMN REG	0x01700000		// NMshift
-	CMN RSR	0x01700010		// NMtypeS
-	
-	CMP IMM 0x03500000		// N imm
-	CMP REG 0x01500000
-	CMP RSR 0x01500010
-	
-	
-	EOR IMM	0x02200000
-	EOR REG	0x00200000
-	EOR REG	0x00200010
-	
-	
-	*/
-	
-#define DP_PARAMS   (eReg Rd, eReg Rn, ShiftOp Shift, ConditionCode CC=AL)
-#define DP_RPARAMS  (eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-
-#define DP_COMMON           \
-    DECL_I;                 \
-\
-    SET_CC;                 \
-    I |= (Rn&15)<<16;       \
-    I |= (Rd&15)<<12;       \
-    I |= (Shift&0xFFF)
-
-#define DP_RCOMMON          \
-    DECL_I;                 \
-\
-    SET_CC;                 \
-    I |= (Rn&15)<<16;       \
-    I |= (Rd&15)<<12;       \
-    I |= (Rm&15)
-
-#define DP_OPCODE(opcode)   \
-    I |= (opcode)<<21
-
-	
-	
-	EAPI	AND DP_PARAMS	{ DP_COMMON;	DP_OPCODE(DP_AND);	EMIT_I; }
-	EAPI	EOR DP_PARAMS	{ DP_COMMON;	DP_OPCODE(DP_EOR);	EMIT_I; }
-	EAPI	SUB DP_PARAMS	{ DP_COMMON;	DP_OPCODE(DP_SUB);	EMIT_I; }
-	EAPI	RSB DP_PARAMS	{ DP_COMMON;	DP_OPCODE(DP_RSB);	EMIT_I; }
-	EAPI	ADD DP_PARAMS	{ DP_COMMON;	DP_OPCODE(DP_ADD);	EMIT_I; }
-	EAPI	ADC DP_PARAMS	{ DP_COMMON;	DP_OPCODE(DP_ADC);	EMIT_I; }
-	EAPI	SBC DP_PARAMS	{ DP_COMMON;	DP_OPCODE(DP_SBC);	EMIT_I; }
-	EAPI	RSC DP_PARAMS	{ DP_COMMON;	DP_OPCODE(DP_RSC);	EMIT_I; }
-	EAPI	TST DP_PARAMS	{ DP_COMMON;	DP_OPCODE(DP_TST);	EMIT_I; }
-	EAPI	TEQ DP_PARAMS	{ DP_COMMON;	DP_OPCODE(DP_TEQ);	EMIT_I; }
-//	EAPI	CMP DP_PARAMS	{ DP_COMMON;	DP_OPCODE(DP_CMP);	EMIT_I; }
-	EAPI	CMN DP_PARAMS	{ DP_COMMON;	DP_OPCODE(DP_CMN);	EMIT_I; }
-	EAPI	ORR DP_PARAMS	{ DP_COMMON;	DP_OPCODE(DP_ORR);	EMIT_I; }
-	EAPI	MOV DP_PARAMS	{ DP_COMMON;	DP_OPCODE(DP_MOV);	EMIT_I; }
-	EAPI	BIC DP_PARAMS	{ DP_COMMON;	DP_OPCODE(DP_BIC);	EMIT_I; }
-	EAPI	MVN DP_PARAMS	{ DP_COMMON;	DP_OPCODE(DP_MVN);	EMIT_I; }
-	
-#if defined(_DEVEL) && defined(_NODEF_)   // These require testing -> CMP/MOV Shifter(Reg)? fmt broken?		// Simple third reg type w/ no shifter
-	EAPI	AND DP_PARAMS	{ DP_RCOMMON;	DP_OPCODE(DP_AND);	EMIT_I; }
-	EAPI	EOR DP_PARAMS	{ DP_RCOMMON;	DP_OPCODE(DP_EOR);	EMIT_I; }
-	EAPI	SUB DP_PARAMS	{ DP_RCOMMON;	DP_OPCODE(DP_SUB);	EMIT_I; }
-	EAPI	RSB DP_PARAMS	{ DP_RCOMMON;	DP_OPCODE(DP_RSB);	EMIT_I; }
-	EAPI	ADD DP_PARAMS	{ DP_RCOMMON;	DP_OPCODE(DP_ADD);	EMIT_I; }
-	EAPI	ADC DP_PARAMS	{ DP_RCOMMON;	DP_OPCODE(DP_ADC);	EMIT_I; }
-	EAPI	SBC DP_PARAMS	{ DP_RCOMMON;	DP_OPCODE(DP_SBC);	EMIT_I; }
-	EAPI	RSC DP_PARAMS	{ DP_RCOMMON;	DP_OPCODE(DP_RSC);	EMIT_I; }
-	EAPI	TST DP_PARAMS	{ DP_RCOMMON;	DP_OPCODE(DP_TST);	EMIT_I; }
-	EAPI	TEQ DP_PARAMS	{ DP_RCOMMON;	DP_OPCODE(DP_TEQ);	EMIT_I; }
-	EAPI	CMP DP_PARAMS	{ DP_RCOMMON;	DP_OPCODE(DP_CMP);	EMIT_I; }
-	EAPI	CMN DP_PARAMS	{ DP_RCOMMON;	DP_OPCODE(DP_CMN);	EMIT_I; }
-	EAPI	ORR DP_PARAMS	{ DP_RCOMMON;	DP_OPCODE(DP_ORR);	EMIT_I; }
-	EAPI	MOV DP_PARAMS	{ DP_RCOMMON;	DP_OPCODE(DP_MOV);	EMIT_I; }
-	EAPI	BIC DP_PARAMS	{ DP_RCOMMON;	DP_OPCODE(DP_BIC);	EMIT_I; }
-	EAPI	MVN DP_PARAMS	{ DP_RCOMMON;	DP_OPCODE(DP_MVN);	EMIT_I; }
-#endif
-
-
-
-		static u32 ARMImmid8r4_enc(u32 imm32)
-		{
-			for (int i=0;i<=30;i+=2)
-			{
-				u32 immv=(imm32<<i) | (imm32>>(32-i));
-				if (immv<256)
-				{
-					return ((i/2)<<8) | immv;
-				}
-			}
-			
-			return -1;
-		}
-
-		static u32 ARMImmid8r4(u32 imm8r4)
-		{
-			u32 rv = ARMImmid8r4_enc(imm8r4);
-			verify(rv!=-1);
-			return rv;
-		}
-
-		static bool is_i8r4(u32 i32) {	return ARMImmid8r4_enc(i32) != -1;	}
-
-   
-
-		EAPI ADD(eReg Rd, eReg Rn, eReg Rm, u32 RmLSL, bool S, ConditionCode CC=AL)
-        {
-            DECL_Id(0x00800000);
-
-			if (S)
-				I |= 1<<20;
-
-			I |= (RmLSL&31)<<7;
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= (Rm&15);
-            EMIT_I;
-        }
-
-		EAPI ADD(eReg Rd, eReg Rn, eReg Rm, bool S, ConditionCode CC=AL)
-		{
-			ADD(Rd,Rn,Rm,0,S,CC);
-		}
-
-		EAPI ADD(eReg Rd, eReg Rn, eReg Rm, ShiftOp Shift, u32 Imm8, ConditionCode CC=AL)
-		{
-            DECL_Id(0x00800000);
-			
-			SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= (Rm&15);
-			I |= Shift<<5;
-			I |= (Imm8&31)<<7;
-			EMIT_I;
-		}
-		
-		EAPI ADD(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-        {
-			ADD(Rd,Rn,Rm,false,CC);
-        }
-
-
-        EAPI ADD(eReg Rd, eReg Rn, s32 Imm8, ConditionCode CC=AL)
-        {
-            DECL_Id(0x02800000);
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= ARMImmid8r4(Imm8);  // * 12b imm is 8b imm 4b rot. spec, add rot support!
-            EMIT_I;
-        }
-
-		EAPI ADC(eReg Rd, eReg Rn, eReg Rm, bool S, ConditionCode CC=AL)
-        {
-            DECL_Id(0x00A00000);
-
-			if (S)
-				I |= 1<<20;
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= (Rm&15);
-            EMIT_I;
-        }
-
-		EAPI ADC(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-        {
-            ADC(Rd,Rn,Rm,false,CC);
-        }
-
-		EAPI ADC(eReg Rd, eReg Rn, s32 Imm8, ConditionCode CC=AL)
-        {
-            DECL_Id(0x02A00000);
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= ARMImmid8r4(Imm8);  // * 12b imm is 8b imm 4b rot. spec, add rot support!
-            EMIT_I;
-        }
-
-		EAPI ADC(eReg Rd, eReg Rn, eReg Rm, bool S, ShiftOp Shift, u32 Imm8, ConditionCode CC=AL)
-		{
-			DECL_Id(0x00A00000);
-			
-			if (S)
-			I |= 1<<20;
-			
-			SET_CC;
-			I |= (Rn&15)<<16;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15);
-			I |= Shift<<5;
-			I |= (Imm8&31)<<7;
-			EMIT_I;
-		}
-		
-	
-
-        EAPI ADR(eReg Rd, s32 Imm8, ConditionCode CC=AL)
-        {
-            DECL_Id(0x028F0000);
-
-            SET_CC;
-            I |= (Rd&15)<<12;
-            I |= ARMImmid8r4(Imm8);  // * 12b imm is 8b imm 4b rot. spec, add rot support!
-            EMIT_I;
-        }
-
-        EAPI ADR_Zero(eReg Rd, s32 Imm8, ConditionCode CC=AL) // Special case for subtraction of 0
-        {
-            DECL_Id(0x024F0000);
-
-            SET_CC;
-            I |= (Rd&15)<<12;
-            I |= ARMImmid8r4(Imm8);  // * 12b imm is 8b imm 4b rot. spec, add rot support!
-            EMIT_I;
-        }
-
-
-        EAPI ORR(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-        {
-            DECL_Id(0x01800000);
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= (Rm&15);
-            EMIT_I;
-        }
-
-        EAPI ORR(eReg Rd, eReg Rn, s32 Imm8, ConditionCode CC=AL)
-        {
-            DECL_Id(0x03800000);
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= ARMImmid8r4(Imm8);  // * 12b imm is 8b imm 4b rot. spec, add rot support!
-            EMIT_I;
-        }
-		
-		EAPI ORR(eReg Rd, eReg Rn, eReg Rm, ShiftOp Shift, eReg Rs, ConditionCode CC=AL)
-		{
-			DECL_Id(0x01800000);
-			
-			SET_CC;
-			I |= (Rn&15)<<16;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15);
-			I |= Shift<<5;
-			I |= (Rs&15)<<8;
-			I |= 1<<4;
-			EMIT_I;
-		}
-	
-		EAPI ORR(eReg Rd, eReg Rn, eReg Rm, bool S, ShiftOp Shift, u32 Imm8, ConditionCode CC=AL)
-		{
-			DECL_Id(0x01800000);
-			
-			if (S)
-				I |= 1<<20;
-			
-			SET_CC;
-			I |= (Rn&15)<<16;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15);
-			I |= Shift<<5;
-			I |= (Imm8&31)<<7;
-			EMIT_I;
-		}
-		
-		EAPI AND(eReg Rd, eReg Rn, eReg Rm, bool S, ConditionCode CC=AL)
-        {
-            DECL_Id(0x00000000);
-
-			if (S)
-				I |= 1<<20;
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= (Rm&15);
-            EMIT_I;
-        }
-
-        EAPI AND(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-        {
-            DECL_Id(0x00000000);
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= (Rm&15);
-            EMIT_I;
-        }
-
-        EAPI AND(eReg Rd, eReg Rn, s32 Imm8, ConditionCode CC=AL)
-        {
-            DECL_Id(0x02000000);
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= ARMImmid8r4(Imm8);  // * 12b imm is 8b imm 4b rot. spec, add rot support!
-            EMIT_I;
-        }
-
-        EAPI AND(eReg Rd, eReg Rn, s32 Imm8, bool S, ConditionCode CC=AL)
-        {
-            DECL_Id(0x02000000);
-
-			if (S)
-				I |= 1<<20;
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= ARMImmid8r4(Imm8);  // * 12b imm is 8b imm 4b rot. spec, add rot support!
-            EMIT_I;
-        }
-
-
-        EAPI EOR(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-        {
-            DECL_Id(0x00200000);
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= (Rm&15);
-            EMIT_I;
-        }
-
-         EAPI EOR(eReg Rd, eReg Rn, eReg Rm, bool S, ConditionCode CC=AL)
-        {
-            DECL_Id(0x00200000);
-
-			if (S)
-				I |= 1<<20;
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= (Rm&15);
-            EMIT_I;
-        }
-
-        EAPI EOR(eReg Rd, eReg Rn, s32 Imm8, ConditionCode CC=AL)
-        {
-            DECL_Id(0x02200000);
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= ARMImmid8r4(Imm8);  // * 12b imm is 8b imm 4b rot. spec, add rot support!
-            EMIT_I;
-        }
-
-
-
-        EAPI SUB(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-        {
-            DECL_Id(0x00400000);
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= (Rm&15);
-            EMIT_I;
-        }
-
-        EAPI SUB(eReg Rd, eReg Rn, s32 Imm8, bool S, ConditionCode CC=AL)
-        {
-            DECL_Id(0x02400000);
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= ARMImmid8r4(Imm8);  // * 12b imm is 8b imm 4b rot. spec, add rot support!
-			if (S)
-				I |= 1<<20;
-            EMIT_I;
-        }
-		EAPI SUB(eReg Rd, eReg Rn, s32 Imm8, ConditionCode CC=AL) { SUB(Rd,Rn,Imm8,false,CC); }
-
-		EAPI SBC(eReg Rd, eReg Rn, eReg Rm, bool S, ConditionCode CC=AL)
-		{
-			DECL_Id(0x00C00000);
-			
-			if (S)
-			I |= 1<<20;
-			
-			SET_CC;
-			I |= (Rn&15)<<16;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15);
-			EMIT_I;
-		}
-		
-		EAPI SBC(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-		{
-			SBC(Rd,Rn,Rm,false,CC);
-		}
-	
-        EAPI RSB(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-        {
-            DECL_Id(0x00600000);
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= (Rm&15);
-            EMIT_I;
-        }
-
-
-        EAPI RSB(eReg Rd, eReg Rn, s32 Imm8, ConditionCode CC=AL)
-        {
-            DECL_Id(0x02600000);
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= ARMImmid8r4(Imm8);  // * 12b imm is 8b imm 4b rot. spec, add rot support!
-            EMIT_I;
-        }
-
-        EAPI RSB(eReg Rd, eReg Rn, s32 Imm8, bool S, ConditionCode CC=AL)
-        {
-            DECL_Id(0x02600000);
-
-			if (S)
-			I |= 1<<20;
-			
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= ARMImmid8r4(Imm8);  // * 12b imm is 8b imm 4b rot. spec, add rot support!
-            EMIT_I;
-        }
-
-
-        EAPI MVN(eReg Rd, eReg Rm, ConditionCode CC=AL)
-        {
-            DECL_Id(0x01E00000);
-
-            SET_CC;
-            I |= (Rd&15)<<12;
-            I |= (Rm&15);
-            EMIT_I;
-        }
-
-
-        EAPI MVN(eReg Rd, s32 Imm8, ConditionCode CC=AL)
-        {
-            DECL_Id(0x03E00000);
-
-            SET_CC;
-            I |= (Rd&15)<<12;
-            I |= ARMImmid8r4(Imm8);  // * 12b imm is 8b imm 4b rot. spec, add rot support!
-            EMIT_I;
-        }
-
-
-        EAPI TST(eReg Rn, eReg Rm, ConditionCode CC=AL)
-        {
-            DECL_Id(0x01100000);
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rm&15);
-            EMIT_I;
-        }
-
-
-        EAPI TST(eReg Rn, u32 Imm12, ConditionCode CC=AL)
-        {
-            DECL_Id(0x03100000);
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= ARMImmid8r4(Imm12);
-            EMIT_I;
-        }
-
-		EAPI BIC(eReg Rd, eReg Rn, s32 Imm8, ConditionCode CC=AL)
-        {
-            DECL_Id(0x03C00000);
-
-            SET_CC;
-            I |= (Rn&15)<<16;
-            I |= (Rd&15)<<12;
-            I |= ARMImmid8r4(Imm8);  // * 12b imm is 8b imm 4b rot. spec, add rot support!
-            EMIT_I;
-        }
-
-
-		/*
-		 *
-		 */
-
-		EAPI UBFX(eReg Rd, eReg Rm, u8 lsb, u8 width, ConditionCode CC=AL)
-		{
-			DECL_Id(0x07E00050);
-			verify(lsb+width<=32);
-
-			SET_CC;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15);
-			I |= (lsb&31)<<7;
-		    I |= ((width-1)&31)<<16;
-		 	EMIT_I;
-		}
-
-		EAPI MOV(eReg Rd, eReg Rm, ConditionCode CC=AL)
-		{
-			DECL_Id(0x01A00000);
-
-			SET_CC;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15);
-			EMIT_I;
-		}
-
-		EAPI MOV(eReg Rd, eReg Rm, bool S, ConditionCode CC=AL)
-		{
-			DECL_Id(0x01A00000);
-			
-			if (S)
-				I |= 1<<20;
-			
-			SET_CC;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15);
-			EMIT_I;
-		}
-		
-		EAPI MOV(eReg Rd, eReg Rm, ShiftOp Shift, u32 Imm8, ConditionCode CC=AL)
-		{
-			DECL_Id(0x01A00000);
-			
-			SET_CC;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15);
-			I |= Shift<<5;
-			I |= (Imm8&31)<<7;
-			EMIT_I;
-		}
-		
-		EAPI MOV(eReg Rd, eReg Rm, ShiftOp Shift, eReg Rs, ConditionCode CC=AL)
-		{
-			DECL_Id(0x01A00000);
-			
-			SET_CC;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15);
-			I |= Shift<<5;
-			I |= (Rs&15)<<8;
-			I |= 1<<4;
-			EMIT_I;
-		}
-	
-		EAPI MOVW(eReg Rd, u32 Imm16, ConditionCode CC=AL)
-		{
-			DECL_Id(0x03000000);
-
-			SET_CC;
-			I |= (Imm16&0xF000)<<4;
-			I |= (Rd&15)<<12;
-			I |= (Imm16&0x0FFF);
-			EMIT_I;
-		}
-
-		EAPI MOVT(eReg Rd, u32 Imm16, ConditionCode CC=AL)
-		{
-			DECL_Id(0x03400000);
-
-			SET_CC;
-			I |= (Imm16&0xF000)<<4;
-			I |= (Rd&15)<<12;
-			I |= (Imm16&0x0FFF);
-			EMIT_I;
-		}
-		
-		EAPI MOV(eReg Rd, s32 Imm8, ConditionCode CC=AL)
-		{
-			DECL_Id(0x03A00000);
-			
-			SET_CC;
-			I |= (Rd&15)<<12;
-			I |= ARMImmid8r4(Imm8);  // * 12b imm is 8b imm 4b rot. spec, add rot support!
-			EMIT_I;
-		}
-		
-	
-
-
-
-		EAPI CMP(eReg Rn, eReg Rm, ConditionCode CC=AL)
-		{
-			DECL_Id(0x01500000);
-
-			SET_CC;
-			I |= (Rn&15)<<16;
-			I |= (Rm&15);
-			EMIT_I;
-		}
-
-
-		EAPI CMP(eReg Rn, s32 Imm8, ConditionCode CC=AL)
-		{
-			DECL_Id(0x03500000);
-
-			SET_CC;
-			I |= (Rn&15)<<16;
-			I |= ARMImmid8r4(Imm8);  // *FIXME* 12b imm is 8b imm 4b rot. spec, add rot support!
-			EMIT_I;
-		}
-
-		EAPI CMP(eReg Rd, eReg Rm, ShiftOp Shift, eReg Rs, ConditionCode CC=AL)
-		{
-			DECL_Id(0x01500000);
-			
-			SET_CC;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15);
-			I |= Shift<<5;
-			I |= (Rs&15)<<8;
-			I |= 1<<4;
-			EMIT_I;
-		}
-		
-		EAPI CMP(eReg Rd, eReg Rm, ShiftOp Shift, u32 Imm8, ConditionCode CC=AL)
-		{
-			DECL_Id(0x01500000);
-			
-			SET_CC;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15);
-			I |= Shift<<5;
-			I |= (Imm8&31)<<7;
-			EMIT_I;
-		}
-		
-		EAPI LSL(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-		{
-			DECL_Id(0x01A00010);
-
-			SET_CC;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15)<<8;
-			I |= (Rn&15)<<0;
-			EMIT_I;
-		}
-		EAPI LSL(eReg Rd, eReg Rm, s32 imm5, ConditionCode CC=AL)
-		{
-			DECL_Id(0x01A00000);
-
-			SET_CC;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15)<<0;
-			I |= (imm5&31)<<7;
-			EMIT_I;
-		}
-
-		EAPI LSR(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-		{
-			DECL_Id(0x01A00030);
-
-			SET_CC;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15)<<8;
-			I |= (Rn&15)<<0;
-			EMIT_I;
-		}
-
-		EAPI RRX(eReg Rd, eReg Rm,bool S=false, ConditionCode CC=AL)
-		{
-			DECL_Id(0x01A00060);
-
-			if (S)
-				I |= 1<<20;
-
-			SET_CC;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15)<<0;
-			EMIT_I;
-		}
-
-		
-		EAPI LSR(eReg Rd, eReg Rm, s32 imm5, bool S, ConditionCode CC=AL)
-		{
-			DECL_Id(0x01A00020);
-
-			if (S)
-				I |= 1<<20;
-
-			SET_CC;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15)<<0;
-			I |= (imm5&31)<<7;
-			EMIT_I;
-		}
-
-		EAPI LSR(eReg Rd, eReg Rm, s32 imm5, ConditionCode CC=AL)
-		{
-			LSR(Rd,Rm,imm5,false,CC);
-		}
-
-
-		EAPI ASR(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-		{
-			DECL_Id(0x01A00050);
-
-			SET_CC;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15)<<8;
-			I |= (Rn&15)<<0;
-			EMIT_I;
-		}
-
-		EAPI ASR(eReg Rd, eReg Rm, s32 imm5, ConditionCode CC=AL)
-		{
-			DECL_Id(0x01A00040);
-
-			SET_CC;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15)<<0;
-			I |= (imm5&31)<<7;
-			EMIT_I;
-		}
-
-		EAPI ROR(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-		{
-			DECL_Id(0x01A00070);
-
-			SET_CC;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15)<<8;
-			I |= (Rn&15)<<0;
-			EMIT_I;
-		}
-
-		EAPI ROR(eReg Rd, eReg Rm, s32 imm5, ConditionCode CC=AL)
-		{
-			DECL_Id(0x01A00060);
-
-			SET_CC;
-			I |= (Rd&15)<<12;
-			I |= (Rm&15)<<0;
-			I |= (imm5&31)<<7;
-			EMIT_I;
-		}
-
-
-
-
-#undef DP_PARAMS
-#undef DP_RPARAMS
-
-#undef DP_COMMON
-#undef DP_RCOMMON
-
-#undef DP_OPCODE
-
-
-
-};
@@ -1,151 +0,0 @@
-/*
- *	E_Extend.h
- *
-
-There are six basic instructions:
-	XTAB16	Extend bits[23:16] and bits[7:0] of one register to 16 bits, and add corresponding halfwordsto the values in another register.
-	XTAB	Extend bits[ 7: 0] of one register to 32 bits, and add to the value in another register.
-	XTAH	Extend bits[15: 0] of one register to 32 bits, and add to the value in another register.
-	XTB16	Extend bits[23:16] and bits[7:0] to 16 bits each.
-	XTB		Extend bits[ 7: 0] to 32 bits.
-	XTH		Extend bits[15: 0] to 32 bits.
-
-Each of the six instructions is available in the following variations, indicated by the prefixes shown:
-	S	Sign extension, with or without addition modulo 216 or 232.
-	U	Zero (unsigned) extension, with or without addition modulo 216 or 232.
-
- */
-#pragma once
-
-
-
-namespace ARM
-{
-
-	EAPI SXTAB16(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x06800070);
-
-		SET_CC;
-		I |= (Rn&15)<<16;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	EAPI SXTAB(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x06A00070);
-
-		SET_CC;
-		I |= (Rn&15)<<16;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	EAPI SXTAH(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x06B00070);
-
-		SET_CC;
-		I |= (Rn&15)<<16;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	EAPI SXTB16(eReg Rd, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x068F0070);
-
-		SET_CC;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	EAPI SXTB(eReg Rd, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x06AF0070);
-
-		SET_CC;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	EAPI SXTH(eReg Rd, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x06BF0070);
-
-		SET_CC;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	EAPI UXTAB16(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x06C00070);
-
-		SET_CC;
-		I |= (Rn&15)<<16;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	EAPI UXTAB(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x06E00070);
-
-		SET_CC;
-		I |= (Rn&15)<<16;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	EAPI UXTAH(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x06F00070);
-
-		SET_CC;
-		I |= (Rn&15)<<16;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	EAPI UXTB16(eReg Rd, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x06CF0070);
-
-		SET_CC;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	EAPI UXTB(eReg Rd, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x06EF0070);
-
-		SET_CC;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	EAPI UXTH(eReg Rd, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x06FF0070);
-
-		SET_CC;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-};
@@ -1,310 +0,0 @@
-/*
- *	E_LoadStore.h
- *
- *	LDR|STR{<cond>}{B}{T} Rd, <addressing_mode>
- *
- */
-#pragma once
-
-
-
-namespace ARM
-{
-
-	
-	enum AddrMode {
-
-		Offset,			// [Rn, offset]		- Base:Offset used for access, no writeback
-		PostIndexed,	// [Rn, offset] !	- Base:Offset used for access, written back to Base reg.
-		PreIndexed		// [Rn],offset		- Base used then Base:Offset written back to Base reg.
-
-		// offset:  imm{8,12}, Rm, Rm <Shifter> #Shift
-	};
-
-
-#define SET_Rn		I |= (Rn&15)<<16
-#define SET_Rt		I |= (Rt&15)<<12
-#define SET_Rm		I |= (Rm&15)
-
-
-#define SET_Rtn		SET_Rt; SET_Rn
-#define SET_Rtnm	SET_Rt; SET_Rn; SET_Rm
-
-
-
-#define SET_I		I |= (1<<25)		// Sets Register (Rather than Immediate) Addressing
-#define SET_P		I |= (1<<24)		// If NOT Set: post-indexed, else offset||pre-indexed (W. determines which)
-#define SET_U		I |= (1<<23)		// If SET: Offset is added to base, else its subtracted (Sign of sImm12)
-#define SET_B		I |= (1<<22)		// If SET: Access is a byte access, else its a word access.
-#define SET_W		I |= (1<<21)		// (P==0) [ W==0: reg. post indexed,  W==1: Unprivileged T variant ]  (P==1) [ W==0: Offset , W==1: Pre-indexed ]
-#define SET_L		I |= (1<<20)		// (L==1) Load / Store
-
-
-#define SET_AddrMode	\
-	if(mode==Offset)			{ SET_P; }	\
-	else if(mode==PreIndexed)	{ SET_P; SET_W; }
-
-/*
-#define SET_AddrMode	\
-	\
-	switch(mode) {	\
-	case PostIndexed:	break;	\
-	case Offset:		SET_P;	break;	\
-	case PreIndexed:	SET_P;	SET_W;	break;	\
-	}
-*/
-
-
-#define SET_sImm12	\
-	\
-	if (0 != sImm12) {				\
-		if (sImm12 > 0)	{ SET_U; }	\
-		I |= (abs(sImm12) &0xFFF);	\
-	}
-
-#define SET_sImm8	\
-	\
-	if(0 != sImm8) {				\
-		verify(is_s8(sImm8));		\
-		if(sImm8 > 0) { SET_U; }	\
-		sImm8 = abs(sImm8);			\
-		I |= ((u32)sImm8 &0x0F);	\
-		I |= ((u32)sImm8 &0xF0)<<4;	\
-	}
-
-
-#define SET_Imm5	I |= ((Imm5&0x1F)<<7)
-#define SET_type	I |= ((type&3)<<5)
-
-
-
-
-
-
-/*	- Load/Store Encoding
-
-	--------------------------------------------------------------------------------------
-
-	cond 01-IPUBWL Rn Rt addr_mode						-- Load/Store Word || Unsigned Byte
-
-		I,P,U,W	- Specify type of addressing mode
-		L		- Specify Load (L==1), else Store
-		B		- Specify Byte (B==1), else Word
-
-	--------------------------------------------------------------------------------------
-
-	cond 000-PUIWL Rn Rt addr_mode 1SH1 addr_mode		-- Load/Store Halfword || Signed byte
-
-		I,P,U,W	- Specify type of addressing mode
-		L		- Specify Load (L==1), else Store
-		S		- Specify signed (S==1), else unsigned access
-		H		- Specify Halfword access, else signed byte	
-
-	--------------------------------------------------------------------------------------
-
-
-	cond 010-PUBWL Rn Rt sImm12-iiii-iiii		Imm Offset
-	cond 011-PUBWL Rn Rt #sft sft_op 0 Rm		Reg Offset
-
-	cond 000 PU1WL Rn Rt imHI 1011 imLO			Imm Offset - halfword
-	cond 000 PU0WL Rn Rt SBZ  1011 Rm			Reg Offset - halfword
-	cond 000 PU1W1 Rn Rt imHI 11H1 imLO			Imm Offset - signed halfword/byte
-	cond 000 PU0W1 Rn Rt SBZ  11H1 Rm			Reg Offset - signed halfword/byte
-	cond 000 PU1W0 Rn Rt imHI 11S1 imLO			Imm Offset - two words
-	cond 000 PU0W0 Rn Rt SBZ  11S1 Rm			Reg Offset - two words
-
-	cond 100-PUSWL Rn Register-list				Multiple
-	cond 110-PUNWL Rn CRd cp_num offs8			COP & double reg xfer
-
-	cond 0001 0B00 Rn Rt SBZ  1001 Rm			Swap [byte]
-
-	--------------------------------------------------------------------------------------
-
-	LDR  L	010 1U001 11 Rt imm12				-	*no literal stores*
-	LDR  I	010 PU0W1 Rn Rt imm12				-	STR  I	010 PU0W0 Rn Rt imm12
-	LDR  R	011	PU0W1 Rn Rt imm5 type 0 Rm		-	STR  R	011 PU0W0 Rn Rt imm5 type 0 Rm
-
-	LDRT I	010 0U011 Rn Rt imm12				-	STRT I	010 0U010 Rn Rt imm12
-	LDRT R	011 0U011 Rn Rt imm5 type 0 Rm		-	STRT R	011 0U010 Rn Rt imm5 type 0 Rm
-
-	LDRB L	010 1U101 11 Rt imm12				-	*^^
-	LDRB I	010 PU1W1 Rn Rt imm12				-	STRB I	010 PU1W0 Rn Rt imm12
-	LDRB R	011 PU1W1 Rn Rt imm5 type 0 Rm		-	STRB R	011 PU1W0 Rn Rt imm5 type 0 Rm
-
-	LDRBT I	
-	LDRBT R	
-
-	--------------------------------------------------------------------------------------
-
-	LDRH L	000 1U101 11 Rt imm4H 1011 imm4L	-	*^^
-	LDRH I	000 PU1W1 Rn Rt imm4H 1011 imm4L	-	STRH I	000 PU1W0 Rn Rt imm4H 1011 imm4L
-	LDRH R	000 PU0W1 Rn Rt 0000  1011 Rm		-	STRH R	000 PU0W0 Rn Rt 0000  1011 Rm
-
-	LDRD L	000 1U100 11 Rt imm4H 1101 imm4L	-	*^^
-	LDRD I	000 PU1W0 Rn Rt imm4H 1101 imm4L	-	STRD I	000 PU1W0 Rn Rt imm4H 1111 imm4L
-	LDRD R	000 PU0W0 Rn Rt 0000  1101 Rm		-	STRD R	000 PU0W0 Rn Rt 0000  1111 Rm
-
-	--------------------------------------------------------------------------------------
-
-	LDRHT/STRHT
-
-	LDREX/STREX
-	LDREXB/STREXB
-	LDREXH/STREXH
-	LDREXD/STREXD
-	--------------------------------------------------------------------------------------
-
-
-	EAPI LDR   0x04100000	// These were all the A1 Versions for Imm IIRC
-	EAPI LDRB  0x04500000
-	EAPI LDRBT 0x06700000
-	EAPI LDRD  0x00000000
-	EAPI LDREX 0x01900090
-	EAPI LDRH  0x00100090
-	EAPI LDRSB 0x00100000
-	EAPI LDRSH 0x00100000
-	EAPI LDRT  0x04300000
-
-	EAPI STR   0x04000000
-	EAPI STRB  0x04400000
-	EAPI STRBT 0x06600000
-	EAPI STRD  0x00000000
-	EAPI STREX 0x01800090
-	EAPI STRH  0x00000090
-	EAPI STRT  0x04200000
-
-*/
-
-
-extern u8* emit_opt;
-extern eReg reg_addr;
-extern eReg reg_dst;
-extern s32 imma;
-
-EAPI LDR (eReg Rt, eReg Rn, s32 sImm12=0, AddrMode mode=Offset, ConditionCode CC=AL)	
-{	
-	if (emit_opt+4==(u8*)EMIT_GET_PTR() && reg_addr==Rn && imma==sImm12)
-	{
-		if (reg_dst!=Rt)
-			MOV(Rt,reg_dst);
-	}
-	else
-	{
-		DECL_Id(0x04100000); SET_CC; SET_Rtn; SET_AddrMode; SET_sImm12; EMIT_I;	
-	}
-}
-EAPI STR (eReg Rt, eReg Rn, s32 sImm12=0, AddrMode mode=Offset, ConditionCode CC=AL)	
-{	
-	emit_opt=0;//(u8*)EMIT_GET_PTR();
-	reg_addr=Rn;
-	reg_dst=Rt;
-	imma=sImm12;
-	DECL_Id(0x04000000); SET_CC; SET_Rtn; SET_AddrMode; SET_sImm12; EMIT_I;	
-}
-EAPI LDRB(eReg Rt, eReg Rn, s32 sImm12=0, AddrMode mode=Offset, ConditionCode CC=AL)	{	DECL_Id(0x04500000); SET_CC; SET_Rtn; SET_AddrMode; SET_sImm12; SET_B; EMIT_I;	}	// Prob don't need SET_B, in iID
-EAPI STRB(eReg Rt, eReg Rn, s32 sImm12=0, AddrMode mode=Offset, ConditionCode CC=AL)	{	DECL_Id(0x04400000); SET_CC; SET_Rtn; SET_AddrMode; SET_sImm12; SET_B; EMIT_I;	}	// Prob don't need SET_B, in iID
-
-EAPI LDRT (eReg Rt, eReg Rn, s32 sImm12=0, ConditionCode CC=AL)	{	DECL_Id(0x04300000); SET_CC; SET_Rtn; SET_sImm12; EMIT_I;	}
-EAPI STRT (eReg Rt, eReg Rn, s32 sImm12=0, ConditionCode CC=AL)	{	DECL_Id(0x04200000); SET_CC; SET_Rtn; SET_sImm12; EMIT_I;	}
-EAPI LDRBT(eReg Rt, eReg Rn, s32 sImm12=0, ConditionCode CC=AL)	{	DECL_Id(0x04700000); SET_CC; SET_Rtn; SET_sImm12; SET_B; EMIT_I;	}	// Prob don't need SET_B, in iID
-EAPI STRBT(eReg Rt, eReg Rn, s32 sImm12=0, ConditionCode CC=AL)	{	DECL_Id(0x04600000); SET_CC; SET_Rtn; SET_sImm12; SET_B; EMIT_I;	}	// Prob don't need SET_B, in iID
-
-		// LDR(r1,r2,r3, Offset, true, L_LSL, 5, EQ);	... LDR r1, r2, +r3 LSL #5
-EAPI LDR (eReg Rt, eReg Rn, eReg Rm, AddrMode mode=Offset, bool Add=false, ShiftOp type=S_LSL, u32 Imm5=0, ConditionCode CC=AL)	{	DECL_Id(0x06100000); SET_CC; SET_Rtnm; SET_AddrMode; SET_Imm5; SET_type; if(Add){ SET_U; } EMIT_I;	}
-EAPI STR (eReg Rt, eReg Rn, eReg Rm, AddrMode mode=Offset, bool Add=false, ShiftOp type=S_LSL, u32 Imm5=0, ConditionCode CC=AL)	{	DECL_Id(0x06000000); SET_CC; SET_Rtnm; SET_AddrMode; SET_Imm5; SET_type; if(Add){ SET_U; } EMIT_I;	}
-EAPI LDRB(eReg Rt, eReg Rn, eReg Rm, AddrMode mode=Offset, bool Add=false, ShiftOp type=S_LSL, u32 Imm5=0, ConditionCode CC=AL)	{	DECL_Id(0x06500000); SET_CC; SET_Rtnm; SET_AddrMode; SET_Imm5; SET_type; if(Add){ SET_U; } SET_B; EMIT_I;	}	// Prob don't need SET_B, in iID
-EAPI STRB(eReg Rt, eReg Rn, eReg Rm, AddrMode mode=Offset, bool Add=false, ShiftOp type=S_LSL, u32 Imm5=0, ConditionCode CC=AL)	{	DECL_Id(0x06400000); SET_CC; SET_Rtnm; SET_AddrMode; SET_Imm5; SET_type; if(Add){ SET_U; } SET_B; EMIT_I;	}	// Prob don't need SET_B, in iID
-
-EAPI LDRT (eReg Rt, eReg Rn, eReg Rm, bool Add=false, ShiftOp type=S_LSL, u32 Imm5=0, ConditionCode CC=AL)	{	DECL_Id(0x06300000); SET_CC; SET_Rtnm; SET_Imm5; SET_type; if(Add){ SET_U; } EMIT_I;	}
-EAPI STRT (eReg Rt, eReg Rn, eReg Rm, bool Add=false, ShiftOp type=S_LSL, u32 Imm5=0, ConditionCode CC=AL)	{	DECL_Id(0x06200000); SET_CC; SET_Rtnm; SET_Imm5; SET_type; if(Add){ SET_U; } EMIT_I;	}
-EAPI LDRBT(eReg Rt, eReg Rn, eReg Rm, bool Add=false, ShiftOp type=S_LSL, u32 Imm5=0, ConditionCode CC=AL)	{	DECL_Id(0x06700000); SET_CC; SET_Rtnm; SET_Imm5; SET_type; if(Add){ SET_U; } SET_B; EMIT_I;	}	// Prob don't need SET_B, in iID
-EAPI STRBT(eReg Rt, eReg Rn, eReg Rm, bool Add=false, ShiftOp type=S_LSL, u32 Imm5=0, ConditionCode CC=AL)	{	DECL_Id(0x06600000); SET_CC; SET_Rtnm; SET_Imm5; SET_type; if(Add){ SET_U; } SET_B; EMIT_I;	}	// Prob don't need SET_B, in iID
-
-
-
-// LDR Rt,[PC, #(s:+/-)Imm12]	*Special Case - Literal / PC Relative
-EAPI LDR(eReg Rt, s32 sImm12, ConditionCode CC=AL) {
-	DECL_Id(0x051F0000); SET_CC; SET_Rt; SET_sImm12; EMIT_I;
-}
-
-// LDRB Rt,[PC, #(s:+/-)Imm12]	*Special Case - Literal / PC Relative
-EAPI LDRB(eReg Rt, s32 sImm12, ConditionCode CC=AL) {
-	DECL_Id(0x055F0000); SET_CC; SET_Rt; SET_sImm12; EMIT_I;
-}
-
-
-
-
-// Note: Following support Post-Indexed addressing only //
-
-
-EAPI LDRH(eReg Rt, eReg Rn, s32 sImm8, ConditionCode CC=AL)	{	DECL_Id(0x005000B0);	SET_CC;	SET_Rtn;	SET_P;	SET_sImm8;	EMIT_I;	}
-EAPI STRH(eReg Rt, eReg Rn, s32 sImm8, ConditionCode CC=AL)	{	DECL_Id(0x004000B0);	SET_CC;	SET_Rtn;	SET_P;	SET_sImm8;	EMIT_I;	}
-EAPI LDRD(eReg Rt, eReg Rn, s32 sImm8, ConditionCode CC=AL)	{	DECL_Id(0x004000D0);	SET_CC;	SET_Rtn;	SET_P;	SET_sImm8;	EMIT_I;	}
-EAPI STRD(eReg Rt, eReg Rn, s32 sImm8, ConditionCode CC=AL)	{	DECL_Id(0x004000F0);	SET_CC;	SET_Rtn;	SET_P;	SET_sImm8;	EMIT_I;	}
-
-EAPI LDRH(eReg Rt, eReg Rn, eReg Rm, bool Add=true,ConditionCode CC=AL)	{	DECL_Id(0x001000B0);	SET_CC;	SET_Rtnm;	SET_P;	if (Add) {SET_U;} EMIT_I;	}
-EAPI STRH(eReg Rt, eReg Rn, eReg Rm, bool Add=true,ConditionCode CC=AL)	{	DECL_Id(0x000000B0);	SET_CC;	SET_Rtnm;	SET_P;	if (Add) {SET_U;} EMIT_I;	}
-EAPI LDRD(eReg Rt, eReg Rn, eReg Rm, bool Add=true, ConditionCode CC=AL)	{	DECL_Id(0x000000D0);	SET_CC;	SET_Rtnm;	SET_P;	if (Add) {SET_U;} EMIT_I;	}
-EAPI STRD(eReg Rt, eReg Rn, eReg Rm, bool Add=true, ConditionCode CC=AL)	{	DECL_Id(0x000000F0);	SET_CC;	SET_Rtnm;	SET_P;	if (Add) {SET_U;} EMIT_I;	}
-
-EAPI LDRSB(eReg Rt, eReg Rn, eReg Rm, bool Add=true,ConditionCode CC=AL)	{	DECL_Id(0x001000D0);	SET_CC;	SET_Rtnm;	SET_P;	if (Add) {SET_U;} EMIT_I;	}
-EAPI LDRSH(eReg Rt, eReg Rn, eReg Rm, bool Add=true,ConditionCode CC=AL)	{	DECL_Id(0x001000F0);	SET_CC;	SET_Rtnm;	SET_P;	if (Add) {SET_U;} EMIT_I;	}
-
-
-EAPI LDRH(eReg Rt, s32 sImm8, ConditionCode CC=AL)			{	DECL_Id(0x015F00B0);	SET_CC;	SET_Rt;	SET_sImm8;	EMIT_I;	}	//	*Special Case - Literal / PC Relative
-EAPI STRH(eReg Rt, s32 sImm8, ConditionCode CC=AL)			{	DECL_Id(0x014F00D0);	SET_CC;	SET_Rt;	SET_sImm8;	EMIT_I;	}	//	*Special Case - Literal / PC Relative
-
-
-
-// TODO: {LD,ST}R{SB,EX*} && friends (If required).
-
-
-// Must use _Reg format
-EAPI PUSH(u32 RegList, ConditionCode CC=AL)
-{
-	DECL_Id(0x092D0000);
-
-	SET_CC;
-	I |= (RegList&0xFFFF);
-	EMIT_I;
-}
-
-
-EAPI POP(u32 RegList, ConditionCode CC=AL)
-{
-	DECL_Id(0x08BD0000);
-
-	SET_CC;
-	I |= (RegList&0xFFFF);
-	EMIT_I;
-}
-
-
-#undef SET_Rtn
-#undef SET_Rtnm
-
-#undef SET_Rn
-#undef SET_Rt
-#undef SET_Rm
-
-#undef SET_I
-#undef SET_P
-#undef SET_U
-#undef SET_B
-#undef SET_W
-#undef SET_L
-
-#undef SET_AddrMode
-
-#undef SET_sImm12
-#undef SET_sImm8
-#undef SET_Imm5
-#undef SET_type
-
-
-
-
-
-
-};
@@ -1,208 +0,0 @@
-/*
- *	E_Misc.h
- *
- */
-#pragma once
-
-
-
-namespace ARM
-{
-
-	/*
-	 *	Misc. Arithmetic Instructions
-	 */
-
-	//	Count Leading Zero's
-	//
-	EAPI CLZ(eReg Rd, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x016F0F10);
-
-		SET_CC;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	
-	//	Unsigned sum of absolute differences
-	//	
-	EAPI USAD8(eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL)
-	{
-		DECL_Id(0x0780F010);
-
-		SET_CC;
-		I |= (Rd&15)<<16;
-		I |= (Rs&15)<<8;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	EAPI USADA8(eReg Rd, eReg Rm, eReg Rs, eReg Rn, ConditionCode CC=AL)
-	{
-		DECL_Id(0x07800010);
-
-		SET_CC;
-		I |= (Rd&15)<<16;
-		I |= (Rn&15)<<12;
-		I |= (Rs&15)<<8;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-	
-
-
-
-	/*
-	 *	Packing Instructions
-	 */
-	
-	
-	EAPI PKHBT(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)    // * shift_imm
-	{
-		DECL_Id(0x06800010);
-
-		SET_CC;
-		I |= (Rn&15)<<16;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-
-	EAPI PKHTB(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)    // * shift_imm
-	{
-		DECL_Id(0x06800050);
-
-		SET_CC;
-		I |= (Rn&15)<<16;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-
-
-	/*
-	 *	Swapping Instructions
-	 */
-
-	EAPI REV(eReg Rd, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x06BF0F30);
-
-		SET_CC;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-
-	EAPI REV16(eReg Rd, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x06BF0FB0);
-
-		SET_CC;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	EAPI REVSH(eReg Rd, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x06FF0F30);
-
-		SET_CC;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-
-	EAPI SEL(eReg Rd, eReg Rn, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x06800FB0);
-
-		SET_CC;
-		I |= (Rn&15)<<16;
-		I |= (Rd&15)<<12;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-
-
-
-	
-	/*
-	 *	Saturate Instructions
-	 */
-
-	
-	 
-	//	SSAT{<cond>} <Rd>, #<immed>, <Rm>{, <shift>}
-	//
-	EAPI SSAT(eReg Rd, u32 sat_imm, eReg Rm, u32 sft_imm, ConditionCode CC=AL)	// sh&1 << 6
-	{
-		DECL_Id(0x06A00010);
-
-		SET_CC;
-		I |= (sat_imm&31)<<16;
-		I |= (Rd&15)<<12;
-		I |= (sft_imm&31)<<7;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	//	SSAT16{<cond>} <Rd>, #<immed>, <Rm>
-	//
-	EAPI SSAT16(eReg Rd, u32 sat_imm, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x06A00030);
-
-		SET_CC;
-		I |= (sat_imm&15)<<16;
-		I |= (Rd&15)<<12;
-		I |= 15<<8;				// * SBO
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	//	USAT{<cond>} <Rd>, #<immed>, <Rm>{, <shift>}
-	//
-	EAPI USAT(eReg Rd, u32 sat_imm, eReg Rm, u32 sft_imm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x06E00010);
-
-		SET_CC;
-		I |= (sat_imm&31)<<16;
-		I |= (Rd&15)<<12;
-		I |= (sft_imm&31)<<7;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	//	USAT16{<cond>} <Rd>, #<immed>, <Rm>
-	//
-	EAPI USAT16(eReg Rd, u32 sat_imm, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x06E00030);
-
-		SET_CC;
-		I |= (sat_imm&15)<<16;
-		I |= (Rd&15)<<12;
-		I |= 15<<8;				// * SBO
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-
-
-
-
-
-
-
-
-};
@@ -1,99 +0,0 @@
-/*
- *	E_Multiply.h
- *
- */
-#pragma once
-
-
-
-namespace ARM
-{
-	
-	EAPI MLA(eReg Rd, eReg Rn, eReg Rs, eReg Rm, ConditionCode CC=AL)   //     *FIXME* S
-	{
-		DECL_Id(0x00200090);
-
-		SET_CC;
-		I |= (Rd&15)<<16;
-		I |= (Rn&15)<<12;
-		I |= (Rs&15)<<8;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	EAPI MUL(eReg Rd, eReg Rs, eReg Rm, ConditionCode CC=AL)   //     *FIXME* S
-	{
-		DECL_Id(0x00000090);
-
-		SET_CC;
-		I |= (Rd&15)<<16;
-		I |= (Rs&15)<<8;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-	EAPI UMULL(eReg Rdhi, eReg Rdlo, eReg Rs, eReg Rm, ConditionCode CC=AL)   //     *FIXME* S
-	{
-		DECL_Id(0x00800090);
-		
-		SET_CC;
-		I |= (Rdhi&15)<<16;
-		I |= (Rdlo&15)<<12;
-		I |= (Rs&15)<<8;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-	
-	EAPI SMULL(eReg Rdhi, eReg Rdlo, eReg Rs, eReg Rm, ConditionCode CC=AL)   //     *FIXME* S
-	{
-		DECL_Id(0x00C00090);
-		
-		SET_CC;
-		I |= (Rdhi&15)<<16;
-		I |= (Rdlo&15)<<12;
-		I |= (Rs&15)<<8;
-		I |= (Rm&15);
-		EMIT_I;
-	}
-	
-	
-
-
-
-	
-#if 0
-SMLA<x><y>	Signed halfword Multiply Accumulate.
-SMLAD		Signed halfword Multiply Accumulate, Dual.
-SMLAL		Signed Multiply Accumulate Long.
-SMLAL<x><y>	Signed halfword Multiply Accumulate Long.
-SMLALD		Signed halfword Multiply Accumulate Long, Dual.
-SMLAW<y>	Signed halfword by word Multiply Accumulate.
-SMLSD		Signed halfword Multiply Subtract, Dual.
-SMLSLD		Signed halfword Multiply Subtract Long Dual.
-SMMLA		Signed Most significant word Multiply Accumulate.
-SMMLS		Signed Most significant word Multiply Subtract.
-SMMUL		Signed Most significant word Multiply.
-SMUAD		Signed halfword Multiply, Add, Dual.
-SMUL<x><y>	Signed halfword Multiply.
-SMULL		Signed Multiply Long.
-SMULW<y>	Signed halfword by word Multiply.
-SMUSD		Signed halfword Multiply, Subtract, Dual.
-UMAAL		Unsigned Multiply Accumulate significant Long.
-UMLAL		Unsigned Multiply Accumulate Long.
-UMULL		Unsigned Multiply Long.
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-};
@@ -1,112 +0,0 @@
-/*
- *	E_Parallel.h
- *
-
-ADD8 Adds each byte of the second operand register to the corresponding byte of the first operand
-		register to form the corresponding byte of the result.
-
-ADD16 Adds the top halfwords of two registers to form the top halfword of the result.
-		Adds the bottom halfwords of the same two registers to form the bottom halfword of the result.
-
-SUB8 Subtracts each byte of the second operand register from the corresponding byte of the first
-		operand register to form the corresponding byte of the result.
-
-SUB16 Subtracts the top halfword of the first operand register from the top halfword of the second operand register to form the top halfword of the result.
-		Subtracts the bottom halfword of the second operand registers from the bottom halfword of
-		the first operand register to form the bottom halfword of the result.
-
-ADDSUBX Does the following:
-	1. Exchanges halfwords of the second operand register.
-	2. Adds top halfwords and subtracts bottom halfwords.
-
-SUBADDX Does the following:
-	1. Exchanges halfwords of the second operand register.
-	2. Subtracts top halfwords and adds bottom halfwords.
-
-
-Each of the six instructions is available in the following variations, indicated by the prefixes shown:
-
-	S	Signed arithmetic modulo 28 or 216. Sets the CPSR GE bits (see The GE[3:0] bits on page A2-13).
-	Q	Signed saturating arithmetic.
-	SH	Signed arithmetic, halving the results to avoid overflow.
-	U	Unsigned arithmetic modulo 28 or 216. Sets the CPSR GE bits (see The GE[3:0] bits on page A2-13).
-	UQ	Unsigned saturating arithmetic.
-	UH	Unsigned arithmetic, halving the results to avoid overflow.
-
-
-Status:
-	These routines require implementation if needed.
-
- */
-#pragma once
-
-
-namespace ARM
-{	
-	
-#if defined(_DEVEL) && 0
-
-	//	S
-	//
-	EAPI SADD8   (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI SADD16  (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI SSUB8   (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI SSUB16  (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI SADDSUBX(eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI SSUBADDX(eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-
-	
-	//	Q
-	//
-	EAPI QADD8   (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI QADD16  (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI QSUB8   (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI QSUB16  (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI QADDSUBX(eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI QSUBADDX(eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-
-
-	//	SH
-	//
-	EAPI SHADD8   (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI SHADD16  (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI SHSUB8   (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI SHSUB16  (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI SHADDSUBX(eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI SHSUBADDX(eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-
-
-	//	U
-	//
-	EAPI UADD8   (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI UADD16  (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI USUB8   (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI USUB16  (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI UADDSUBX(eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI USUBADDX(eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-
-
-	//	UQ
-	//
-	EAPI UQADD8   (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI UQADD16  (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI UQSUB8   (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI UQSUB16  (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI UQADDSUBX(eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI UQSUBADDX(eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-
-
-	//	UH
-	//
-	EAPI UHADD8   (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI UHADD16  (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI UHSUB8   (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI UHSUB16  (eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI UHADDSUBX(eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-	EAPI UHSUBADDX(eReg Rd, eReg Rm, eReg Rs, ConditionCode CC=AL) ;
-
-#endif
-
-
-	
-};
@@ -1,74 +0,0 @@
-/*
- *	E_Special.h
- *
- */
-#pragma once
-
-
-namespace ARM
-{
-	
-	
-	
-	
-	
-	EAPI ARMERROR()
-	{
-		DECL_Id(0xFFFFFFFF);
-		EMIT_I;
-	}
-
-
-	EAPI NOP()
-	{
-		DECL_Id(0xE320F000);
-		EMIT_I;
-	}
-
-	EAPI SVC(u32 code)
-	{
-		DECL_Id(0x0F000000);
-		I |= code&0xFFFFFF;
-		EMIT_I;
-	}
-
-	EAPI BKPT()
-	{
-		DECL_Id(0x01200070);
-		EMIT_I;
-	}
-
-#define SWI SVC
-
-
-
-
-
-	/*
-	 *	Synchronization & Barrier Instructions.
-	 *
-	 */
-
-
-	EAPI DSB()
-	{
-		DECL_Id(0xF57FF04F);
-		EMIT_I;
-	}
-
-	EAPI DMB()
-	{
-		DECL_Id(0xF57FF05F);
-		EMIT_I;
-	}
-
-	EAPI ISB()
-	{
-		DECL_Id(0xF57FF06F);
-		EMIT_I;
-	}
-
-
-
-};
-
@@ -1,99 +0,0 @@
-/*
- *	E_Status.h
- *
- */
-#pragma once
-
-
-
-namespace ARM
-{
-
-#if defined(_DEVEL)
-	
-	//	MRS	Move PSR to General-purpose Register.
-	//
-	EAPI MRS(eReg Rd, u32 R, ConditionCode CC=AL)
-	{
-		DECL_Id(0x01000000);
-
-		SET_CC;
-		I |= (R&1) << 22;
-		I |= 15<<16;			// * SBO
-		I |= (Rd  &15)<<12;
-		EMIT_I;
-	}
-
-
-	/*	MSR	Move General-purpose Register to PSR.
-
-		MSR{<cond>} CPSR_<fields>, #<immediate>
-		MSR{<cond>} CPSR_<fields>, <Rm>
-		MSR{<cond>} SPSR_<fields>, #<immediate>
-		MSR{<cond>} SPSR_<fields>, <Rm>
-	*/
-	
-
-	// MSR: Immediate operand
-	//
-	EAPI MSR(u32 R, u32 fmask, u32 rot_imm, u32 imm8, ConditionCode CC=AL)
-	{
-		DECL_Id(0x03200000);
-
-		SET_CC;
-		I |= (R&1) << 22;
-		I |= (fmask &15)<<16;
-		I |= 15<<12;			// * SBO
-		I |= (rot_imm &15)<<8;
-		I |= (imm8 &255);
-		EMIT_I;
-	}
-
-		
-	// MSR: Register operand
-	//
-	EAPI MSR(u32 R, u32 fmask, eReg Rm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x01200000);
-
-		SET_CC;
-		I |= (R&1) << 22;
-		I |= (fmask &15)<<16;
-		I |= 15<<12;			// * SBO
-		I |= (Rm&15);
-		EMIT_I;
-	}
-
-
-
-	//	CPS	Change Processor State.
-	//
-	EAPI CPS(u32 imod, u32 mmod, u32 mode)	// ** [A|I|F] 
-	{
-		DECL_Id(0xF1000000);	
-
-		//	Note: UNconditional instruction!
-		I |= (imod&3)<<18;
-		I |= (mmod&1)<<17;
-		I |= (mode&15);
-		EMIT_I;
-	}
-
-
-
-
-
-	//	SETEND	Modifies the CPSR endianness, E, bit, without changing any other bits in the CPSR.
-	//
-	EAPI SETEND(u32 E)
-	{
-		DECL_Id(0xF1010000);
-
-		//	Note: UNconditional instruction!
-		I |= (E &1) << 9;
-		EMIT_I;
-	}
-
-#endif
-
-};
@@ -1,667 +0,0 @@
-/*
- *	E_VDataOp.h		* VFP/A.SIMD Data Processing Instruction Set Encoding
- *
- *		V{<modifier>}<operation>{<shape>}<c><q>{.<dt>} {<dest>,} <src1>, <src2>
- *
- *		<modifier>		Meaning
- *			Q		The operation uses saturating arithmetic.
- *			R		The operation performs rounding.
- *			D		The operation doubles the result (before accumulation, if any).
- *			H		The operation halves the result.
- *
- *		<shape>		Meaning														Typical register shape
- *		(none)	The operands and result are all the same width.					Dd, Dn, Dm  -  Qd, Qn, Qm
- *		L		Long operation   - result is 2 x width of both operands			Qd, Dn, Dm
- *		N		Narrow operation - result is width/2 both operands				Dd, Qn, Qm
- *		W		Wide operation   - result and oper[1] are 2x width oper[2]		Qd, Qn, Dm
- */
-#pragma once
-
-
-namespace ARM
-{
-	
-
-
-
-#define SET_Qd					\
-	I |= (((Qd<<1)&0x0E)<<12);	\
-	I |= (((Qd<<1)&0x10)<<18)
-
-#define SET_Qn					\
-	I |= (((Qn<<1)&0x0E)<<16);	\
-	I |= (((Qn<<1)&0x10)<<3)
-
-#define SET_Qm					\
-	I |= (((Qm<<1)&0x0E));		\
-	I |= (((Qm<<1)&0x10)<<1)
-
-
-
-#define SET_Dd					\
-	I |= ((Dd&0x0F)<<12);		\
-	I |= ((Dd&0x10)<<18)
-
-#define SET_Dn					\
-	I |= ((Dn&0x0F)<<16);		\
-	I |= ((Dn&0x10)<<3)
-
-#define SET_Dm					\
-	I |= ((Dm&0x0F));			\
-	I |= ((Dm&0x10)<<1)
-
-
-
-
-#define SET_Q       I |= 0x40
-#define SET_U       I |= ((U&1)<<24);
-#define SET_Size    I |= (((Size>>4)&3)<<20)    // 8,16,32 -> 0,1,2
-
-
-#define SET_Qdnm	\
-	SET_Qd;	SET_Qn;	SET_Qm;	SET_Q
-
-#define SET_Ddnm	\
-	SET_Dd;	SET_Dn;	SET_Dm
-
-#define DECL_Qdnm
-    
-    
-    
-    
-
-#define VdpInstrF(viName, viId)	\
-		EAPI V##viName##_F32	(eFQReg Qd, eFQReg Qn, eFQReg Qm)  {   DECL_Id(viId);  SET_Qdnm;   EMIT_I; }   \
-		EAPI V##viName##_F32	(eFDReg Dd, eFDReg Dn, eFDReg Dm)  {   DECL_Id(viId);  SET_Ddnm;   EMIT_I; }   
-
-
-#define VdpInstrI_EOR(viName, viId) \
-		EAPI V##viName	(eFQReg Qd, eFQReg Qn, eFQReg Qm)  {   DECL_Id(viId);  SET_Qdnm;   EMIT_I; }   \
-		EAPI V##viName	(eFDReg Dd, eFDReg Dn, eFDReg Dm)  {   DECL_Id(viId);  SET_Ddnm;   EMIT_I; }   \
-
-#define VdpInstrI(viName, viId) \
-		EAPI V##viName	(eFQReg Qd, eFQReg Qn, eFQReg Qm, u32 Size=32)  {   DECL_Id(viId);  SET_Qdnm;   SET_Size;   EMIT_I; }   \
-		EAPI V##viName	(eFDReg Dd, eFDReg Dn, eFDReg Dm, u32 Size=32)  {   DECL_Id(viId);  SET_Ddnm;   SET_Size;   EMIT_I; }   \
-                    \
-                EAPI V##viName##_I8  (eFQReg Qd, eFQReg Qn, eFQReg Qm)    {   V##viName   (Qd, Qn, Qm, 8);    }   \
-                EAPI V##viName##_I8  (eFDReg Dd, eFDReg Dn, eFDReg Dm)    {   V##viName   (Dd, Dn, Dm, 8);    }   \
-                EAPI V##viName##_I16 (eFQReg Qd, eFQReg Qn, eFQReg Qm)    {   V##viName   (Qd, Qn, Qm, 16);   }   \
-                EAPI V##viName##_I16 (eFDReg Dd, eFDReg Dn, eFDReg Dm)    {   V##viName   (Dd, Dn, Dm, 16);   }   \
-                EAPI V##viName##_I32 (eFQReg Qd, eFQReg Qn, eFQReg Qm)    {   V##viName   (Qd, Qn, Qm, 32);   }   \
-                EAPI V##viName##_I32 (eFDReg Dd, eFDReg Dn, eFDReg Dm)    {   V##viName   (Dd, Dn, Dm, 32);   }
-
-#define VdpInstrU(viName, viId)	\
-		EAPI V##viName	(eFQReg Qd, eFQReg Qn, eFQReg Qm, u32 Size=32, u32 U=0)	{	DECL_Id(viId);	SET_Qdnm;   SET_U;  SET_Size;	EMIT_I;	}	\
-		EAPI V##viName	(eFDReg Dd, eFDReg Dn, eFDReg Dm, u32 Size=32, u32 U=0)	{	DECL_Id(viId);	SET_Ddnm;   SET_U;  SET_Size;	EMIT_I;	}       \
-                    \
-                EAPI V##viName##_U8  (eFQReg Qd, eFQReg Qn, eFQReg Qm)    {   V##viName   (Qd, Qn, Qm, 8,  1);   }   \
-                EAPI V##viName##_U8  (eFDReg Dd, eFDReg Dn, eFDReg Dm)    {   V##viName   (Dd, Dn, Dm, 8,  1);   }   \
-                EAPI V##viName##_S8  (eFQReg Qd, eFQReg Qn, eFQReg Qm)    {   V##viName   (Qd, Qn, Qm, 8,  0);   }   \
-                EAPI V##viName##_S8  (eFDReg Dd, eFDReg Dn, eFDReg Dm)    {   V##viName   (Dd, Dn, Dm, 8,  0);   }   \
-                EAPI V##viName##_U16 (eFQReg Qd, eFQReg Qn, eFQReg Qm)    {   V##viName   (Qd, Qn, Qm, 16, 1);   }   \
-                EAPI V##viName##_U16 (eFDReg Dd, eFDReg Dn, eFDReg Dm)    {   V##viName   (Dd, Dn, Dm, 16, 1);   }   \
-                EAPI V##viName##_S16 (eFQReg Qd, eFQReg Qn, eFQReg Qm)    {   V##viName   (Qd, Qn, Qm, 16, 0);   }   \
-                EAPI V##viName##_S16 (eFDReg Dd, eFDReg Dn, eFDReg Dm)    {   V##viName   (Dd, Dn, Dm, 16, 0);   }   \
-                EAPI V##viName##_U32 (eFQReg Qd, eFQReg Qn, eFQReg Qm)    {   V##viName   (Qd, Qn, Qm, 32, 1);   }   \
-                EAPI V##viName##_U32 (eFDReg Dd, eFDReg Dn, eFDReg Dm)    {   V##viName   (Dd, Dn, Dm, 32, 1);   }   \
-                EAPI V##viName##_S32 (eFQReg Qd, eFQReg Qn, eFQReg Qm)    {   V##viName   (Qd, Qn, Qm, 32, 0);   }   \
-                EAPI V##viName##_S32 (eFDReg Dd, eFDReg Dn, eFDReg Dm)    {   V##viName   (Dd, Dn, Dm, 32, 0);   }
-
-//#       define VdpInstrImm  (viName, viId)
-    
-
-	// Another three or four like the above .. immN, above w/ size, F32 w/ sz
-
-	
-/*
- *	A.SIMD Parallel Add/Sub
- *
-	Vector Add											VADD (integer),	VADD (floating-point)
-	Vector Add and Narrow, returning High Half			VADDHN
-	Vector Add Long, Vector Add Wide					VADDL, VADDW
-	Vector Halving Add, Vector Halving Subtract			VHADD, VHSUB
-	Vector Pairwise Add and Accumulate Long				VPADAL
-	Vector Pairwise Add									VPADD (integer) ,	VPADD (floating-point)
-	Vector Pairwise Add Long							VPADDL
-	Vector Rounding Add & Narrow, returning High Half	VRADDHN
-	Vector Rounding Halving Add							VRHADD
-	Vector Rounding Subtract & Narrow, ret. High Half	VRSUBHN
-	Vector Saturating Add								VQADD
-	Vector Saturating Subtract							VQSUB
-	Vector Subtract										VSUB (integer),	VSUB (floating-point)
-	Vector Subtract and Narrow, returning High Half		VSUBHN
-	Vector Subtract Long, Vector Subtract Wide			VSUBL, VSUBW
-*/
-
-	VdpInstrI(ADD,	0xF2000800)
-	VdpInstrF(ADD,	0xF2000D00)
-
-
-	VdpInstrI(HADD,      0xF2000800)
-	VdpInstrI(HSUB,      0xF2000A00)
-
-	VdpInstrI(PADD,      0xF2000B10)
-	VdpInstrF(PADD,      0xF3000D00)
-
-
-	VdpInstrU(RHADD,     0xF3000100)
-	VdpInstrU(QADD,      0xF2000010)
-	VdpInstrU(QSUB,      0xF3000210)
-
-	VdpInstrI(SUB,       0xF3000800)
-	VdpInstrF(SUB,       0xF2200D00)
-
-
-	//	VADD I			{	DECL_Id(0xF2000800);	SET_Qdnm;	EMIT_I;	}
-	//	VADD F			{	DECL_Id(0xF2000D00);	SET_Qdnm;	EMIT_I;	}
-	//	VADDHN			{	DECL_Id(0xF2800400);	SET_Qdnm;	EMIT_I;	}   // DQQ
-	//	VADD{L,W}		{	DECL_Id(0xF2800000);	SET_Qdnm;	EMIT_I;	}   // QDD || QQD
-	//	VH{ADD,SUB}		{	DECL_Id(0xF2000000);	SET_Qdnm;	EMIT_I;	}
-	//	VPADAL			{	DECL_Id(0xF3B00600);	SET_Qdnm;	EMIT_I;	}   // QdQm || DdDm
-	//	VPADD I			{	DECL_Id(0xF2000B10);	SET_Qdnm;	EMIT_I;	}   // DDD only
-	//	VPADD F			{	DECL_Id(0xF3000D00);	SET_Qdnm;	EMIT_I;	}   // DDD only
-	//	VPADDL			{	DECL_Id(0xF3B00200);	SET_Qdnm;	EMIT_I;	}   // QdQm || DdDm
-	//	VRADDHN			{	DECL_Id(0xF3800400);	SET_Qdnm;	EMIT_I;	}   // DQQ
-	//	VRHADD			{	DECL_Id(0xF3000100);	SET_Qdnm;	EMIT_I;	}
-	//	VRSUBHN			{	DECL_Id(0xF3800600);	SET_Qdnm;	EMIT_I;	}   // DQQ
-	//	VQADD			{	DECL_Id(0xF2000010);	SET_Qdnm;	EMIT_I;	}
-	//	VQSUB			{	DECL_Id(0xF3000210);	SET_Qdnm;	EMIT_I;	}
-	//	VSUB I			{	DECL_Id(0xF3000800);	SET_Qdnm;	EMIT_I;	}
-	//	VSUB F			{	DECL_Id(0xF2200D00);	SET_Qdnm;	EMIT_I;	}
-	//	VSUBHN			{	DECL_Id(0xF2800600);	SET_Qdnm;	EMIT_I;	}   // DQQ
-	//	VSUB{L,W}		{	DECL_Id(0xF2800200);	SET_Qdnm;	EMIT_I;	}   // QDD || QQD
-
-
-
-
-
-
-/*
- *	A.SIMD Bitwise
- *
-	Vector Bitwise AND							VAND (register)
-	Vector Bitwise Bit Clear (AND complement)	VBIC (immediate), VBIC (register)
-	Vector Bitwise Exclusive OR					VEOR
-	Vector Bitwise Move							VMOV (immediate),	VMOV (register)
-	Vector Bitwise NOT							VMVN (immediate),	VMVN (register)
-	Vector Bitwise OR							VORR (immediate), 	VORR (register)
-	Vector Bitwise OR NOT						VORN (register)
-	Vector Bitwise Insert if False				VBIF
-	Vector Bitwise Insert if True				VBIT
-	Vector Bitwise Select						VBSL
-*/
-
-	VdpInstrI(AND,      0xF2000110)
-	VdpInstrI(BIC,      0xF2100110)
-	VdpInstrI_EOR(EOR,      0xF3000110)
-	VdpInstrI_EOR(BSL,      0xF3100110)
-	VdpInstrI_EOR(BIT,      0xF3200110)
-	VdpInstrI_EOR(BIF,      0xF3300110)
-	VdpInstrI(ORN,      0xF2300110)
-	//	VAND R			{	DECL_Id(0xF2000110);	SET_Qdnm;	EMIT_I;	}
-	//	VBIC R			{	DECL_Id(0xF2100110);	SET_Qdnm;	EMIT_I;	}
-	//	VEOR			{	DECL_Id(0xF3000110);	SET_Qdnm;	EMIT_I;	}
-	//	VBSL			{	DECL_Id(0xF3100110);	SET_Qdnm;	EMIT_I;	}
-	//	VBIT			{	DECL_Id(0xF3200110);	SET_Qdnm;	EMIT_I;	}
-	//	VBIF			{	DECL_Id(0xF3300110);	SET_Qdnm;	EMIT_I;	}
-	//	VORN R			{	DECL_Id(0xF2300110);	SET_Qdnm;	EMIT_I;	}
-
-	//	VBIC I			{	DECL_Id(0xF2800030);	SET_Qd;	SET_IMM??;	EMIT_I;	}
-	//	VMOV I			{	DECL_Id(0xF2800010);	SET_Qd;	SET_IMM??;	EMIT_I;	}
-	//	VMVN I			{	DECL_Id(0xF2800030);	SET_Qd;	SET_IMM??;	EMIT_I;	}
-	//	VORR I			{	DECL_Id(0xF2800010);	SET_Qd;	SET_IMM??;	EMIT_I;	}
-	//	VAND I		VBIC I
-	//	VORN I		VORR I
-
-
-
-
-
-/*
- *	A.SIMD comparison
- *
-	Vector Absolute Compare							VACGE, VACGT, VACLE,VACLT
-	Vector Compare Equal							VCEQ (register)
-	Vector Compare Equal to Zer						VCEQ (immediate #0)
-	Vector Compare Greater Than or Equal			VCGE (register)
-	Vector Compare Greater Than or Equal to Zero	VCGE (immediate #0)
-	Vector Compare Greater Than						VCGT (register)
-	Vector Compare Greater Than Zero				VCGT (immediate #0)
-	Vector Compare Less Than or Equal to Zero		VCLE (immediate #0)
-	Vector Compare Less Than Zero					VCLT (immediate #0)
-	Vector Test Bits VTST
-*/
-	//	VAC{COND}		{	DECL_Id(0xF3000E10);	SET_Vdnm;	EMIT_I;	}
-
-	//	VCEQ			{	DECL_Id(0xF3000810);	SET_Vdnm;	EMIT_I;	}	.F32	{	DECL_Id(0xF2000E00);	SET_Vdnm;	EMIT_I;	}
-	VdpInstrI(CEQ, 0xF3200810)
-//	VdpInstrF(CEQ, 0xF2000e00)	
-	//	VCGE			{	DECL_Id(0xF2000310);	SET_Vdnm;	EMIT_I;	}	.F32	{	DECL_Id(0xF3000E00);	SET_Vdnm;	EMIT_I;	}
-	VdpInstrI(CGE, 0xF2200310)
-//	VdpInstrF(CGE, 0xF3000e00)	
-	//	VCGT			{	DECL_Id(0xF2000300);	SET_Vdnm;	EMIT_I;	}	.F32	{	DECL_Id(0xF3200E00);	SET_Vdnm;	EMIT_I;	}
-	//*SEB*  0xF220030 for S32, 0xF3200300 for U32, 0xF2000300 is for S8.
-	VdpInstrI(CGT, 0xF2200300)
-	//VdpInstrF(CGT, 0xF3200e00)
-	//	VCLE			{	DECL_Id(0xF3B10180);	SET_Vdnm;	EMIT_I;	}	//	R is VCGE w/ operands reversed
-	//	VCLT			{	DECL_Id(0xF3B10200);	SET_Vdnm;	EMIT_I;	}	//	R is VCGT w/ operands reversed
-	//	VTST			{	DECL_Id(0xF2000810);	SET_Vdnm;	EMIT_I;	}
-
-	//	VCEQZ			{	DECL_Id(0xF3B10100);	SET_Vd;	SET_Vm;	EMIT_I;	}
-	//	VCGEZ			{	DECL_Id(0xF3B10080);	SET_Vd;	SET_Vm;	EMIT_I;	}
-	//	VCGTZ			{	DECL_Id(0xF3B10000);	SET_Vd;	SET_Vm;	EMIT_I;	}
-
-
-
-
-
-
-/*
- *	A.SIMD shift			** SET_imm6;	needed for non Vdnm 
- *
-	Vector Saturating Rounding Shift Left				VQRSHL
-	Vector Saturating Rounding Shift Right and Narrow	VQRSHRN, VQRSHRUN
-	Vector Saturating Shift Left						VQSHL (register), VQSHL, VQSHLU (immediate)
-	Vector Saturating Shift Right and Narrow			VQSHRN, VQSHRUN 
-	Vector Rounding Shift Left							VRSHL
-	Vector Rounding Shift Right							VRSHR
-	Vector Rounding Shift Right and Accumulate			VRSRA
-	Vector Rounding Shift Right and Narrow				VRSHRN
-	Vector Shift Left VSHL (immediate) on page A8-750	VSHL (register)
-	Vector Shift Left Long								VSHLL
-	Vector Shift Right									VSHR
-	Vector Shift Right and Narrow						VSHRN
-	Vector Shift Left and Insert						VSLI
-	Vector Shift Right and Accumulate					VSRA
-	Vector Shift Right and Insert						VSRI
-*/
-	//	VQRSHL			{	DECL_Id(0xF SET_Vdnm;		EMIT_I;	}		// * TODO
-	//	VQRSHRN			{	DECL_Id(0xF SET_Vd;	SET_Vm;	EMIT_I;	}
-	//	VQRSHRUN		{	DECL_Id(0xF SET_Vd;	SET_Vm;	EMIT_I;	}
-	//	VQSHL R			{	DECL_Id(0xF SET_Vdnm;		EMIT_I;	}
-	//	VQSHL I			{	DECL_Id(0xF SET_Vd;	SET_Vm;	EMIT_I;	}
-	//	VQSHLU			{	DECL_Id(0xF SET_Vd;	SET_Vm;	EMIT_I;	}
-	//	VQSHRN			{	DECL_Id(0xF SET_Vd;	SET_Vm;	EMIT_I;	}
-	//	VQSHRUN			{	DECL_Id(0xF SET_Vd;	SET_Vm;	EMIT_I;	}
-	//	VRSHL			{	DECL_Id(0xF SET_Vdnm;		EMIT_I;	}
-	//	VRSHR			{	DECL_Id(0xF SET_Vd;	SET_Vm;	EMIT_I;	}
-	//	VRSRA			{	DECL_Id(0xF SET_Vd;	SET_Vm;	EMIT_I;	}
-	//	VRSHRN			{	DECL_Id(0xF SET_Vd;	SET_Vm;	EMIT_I;	}
-	//	VSHL I			{	DECL_Id(0xF SET_Vd;	SET_Vm;	EMIT_I;	}
-	//	VSHL R			{	DECL_Id(0xF SET_Vdnm;		EMIT_I;	}
-	//	VSHLL			{	DECL_Id(0xF SET_Vd;	SET_Vm;	EMIT_I;	}
-	//	VSHR			{	DECL_Id(0xF SET_Vd;	SET_Vm;	EMIT_I;	}
-	//	VSHRN			{	DECL_Id(0xF SET_Vd;	SET_Vm;	EMIT_I;	}
-	//	VSLI			{	DECL_Id(0xF SET_Vd;	SET_Vm;	EMIT_I;	}
-	//	VSRA			{	DECL_Id(0xF SET_Vd;	SET_Vm;	EMIT_I;	}
-	//	VSRI			{	DECL_Id(0xF SET_Vd;	SET_Vm;	EMIT_I;	}
-
-
-
-
-/*
- *	A.SIMD multiply
- *
-	Vector Multiply Accumulate										VMLA, VMLAL, VMLS, VMLSL (integer) ,	VMLA, VMLS (floating-point),	VMLA, VMLAL, VMLS, VMLSL (by scalar)
-	Vector Multiply Accumulate Long
-	Vector Multiply Subtract
-	Vector Multiply Subtract Long
-	Vector Multiply													VMUL, VMULL (integer and polynomial)
-	Vector Multiply Long											VMUL (floating-point) on page A8-664 	VMUL, VMULL (by scalar)
-	Vector Saturating Doubling Multiply Accumulate Long				VQDMLAL, VQDMLSL
-	Vector Saturating Doubling Multiply Subtract Long
-	Vector Saturating Doubling Multiply Returning High Half			VQDMULH
-	Vector Saturating Rounding Doubling Multiply Ret. High Half		VQRDMULH
-	Vector Saturating Doubling Multiply Long						VQDMULL
-*/
-
-	VdpInstrI(MLA,       0xF2000900)
-	VdpInstrI(MLS,       0xF3000900)
-	
-	VdpInstrF(MLA,       0xF2000D10)
-	VdpInstrF(MLS,       0xF2200D10)
-	
-	//by scalar
-	//this should be really qd,dn,sm not dm
-	EAPI VMUL_F32(eFQReg Qd,eFQReg Qn, eFDReg Dm, int idx)	
-	{
-		DECL_Id(0xF2800840);
-		
-		SET_Qd;
-		SET_Qn;
-		I |= 1<<8;	//SET_F
-		
-		SET_Dm;
-		I |= 0x1<<24;	//SET_Q not compatible
-
-		I |= 2<<20;		//size to 32
-		
-		I |= Dm&15;		//only lower 15 regs are avail
-
-
-		//set register sub index
-		if (idx)
-			I |= 1<<5;
- 
-		EMIT_I;
-	}
-		
-	EAPI VMLA_F32(eFQReg Qd,eFQReg Qn, eFDReg Dm, int idx)	
-	{
-		DECL_Id(0xF2800040);
-		
-		SET_Qd;
-		SET_Qn;
-		I |= 1<<8;	//SET_F
-		
-		SET_Dm;
-		I |= 0x1<<24;	//SET_Q not compatible
-
-		I |= 2<<20;		//size to 32
-		
-		I |= Dm&15;		//only lower 15 regs are avail
-
-
-		//set register sub index
-		if (idx)
-			I |= 1<<5;
- 
-		EMIT_I;
-	}
-//	VdpInstrU(MLAL,       0xF2000D10)	*QDD
-//	VdpInstrU(MLSL,       0xF2200D10)	*QDD
-	
-	
-	VdpInstrI(MUL,       0xF2000910)
-	
-	VdpInstrF(MUL,       0xF3000D10)
-	
-//	VdpInstrU(MULL,       0xF3000D10)	*QDD
-
-	//	VMLA  I			{	DECL_Id(0xF2000900);	SET_Vdnm;	EMIT_I;	}	// * I |= ((size&3)<<20)
-	//	VMLS  I			{	DECL_Id(0xF3000900);	SET_Vdnm;	EMIT_I;	}	// * I |= ((size&3)<<20)
-	//	VMLAL I			{	DECL_Id(0xF2800800);	SET_Vdnm;	EMIT_I;	}	// * I |= ((size&3)<<20)	* I |= ((U&1)<<24)
-	//	VMLSL I			{	DECL_Id(0xF2800A00);	SET_Vdnm;	EMIT_I;	}	// * I |= ((size&3)<<20)	* I |= ((U&1)<<24)
-
-	//	VMLA  F			{	DECL_Id(0xF2000D10);	SET_Vdnm;	EMIT_I;	}	// * I |= ((sz&1)<<20)
-	//	VMLS  F			{	DECL_Id(0xF2200D10);	SET_Vdnm;	EMIT_I;	}	// * I |= ((sz&1)<<20)
-
-	//	VMLA  S			{	DECL_Id(0xF2800040);	SET_Vdnm;	EMIT_I;	}	// * I |= ((size&3)<<20)
-	//	VMLS  S			{	DECL_Id(0xF2800440);	SET_Vdnm;	EMIT_I;	}	// * I |= ((size&3)<<20)
-	//	CMLAL S			{	DECL_Id(0xF2800240);	SET_Vdnm;	EMIT_I;	}	// * I |= ((size&3)<<20)	* I |= ((U&1)<<24)
-	//	VMLSL S			{	DECL_Id(0xF2800640);	SET_Vdnm;	EMIT_I;	}	// * I |= ((size&3)<<20)	* I |= ((U&1)<<24)
-
-	//	VMUL  IP		{	DECL_Id(0xF2000910);	SET_Vdnm;	EMIT_I;	}	// * I |= ((size&3)<<20)	* I |= 1<<24 for polynomial
-	//	VMULL IP		{	DECL_Id(0xF2800C00);	SET_Vdnm;	EMIT_I;	}	// * I |= ((size&3)<<20)	* I |= 1<<9  for polynomial		* I |= ((U&1)<<24)
-
-	//	VMUL  F			{	DECL_Id(0xF3000D10);	SET_Vdnm;	EMIT_I;	}	// * I |= ((sz&1)<<20)
-
-	//	VMUL  S			{	DECL_Id(0xF2800840);	SET_Vdnm;	EMIT_I;	}	// * I |= ((size&3)<<20)
-	//	VMULL S			{	DECL_Id(0xF2800A40);	SET_Vdnm;	EMIT_I;	}	// * I |= ((size&3)<<20)	* I |= ((U&1)<<24)
-	//	VQDMLAL			{	DECL_Id(0xF2800900);	SET_Vdnm;	EMIT_I;	}	// * I |= ((size&3)<<20)
-	//	VQDMLSL			{	DECL_Id(0xF2800B00);	SET_Vdnm;	EMIT_I;	}	// * I |= ((size&3)<<20)
-	//	VQDMULH			{	DECL_Id(0xF2000B00);	SET_Vdnm;	EMIT_I;	}	// * I |= ((size&3)<<20)
-	//	VQRDMULH		{	DECL_Id(0xF3000B00);	SET_Vdnm;	EMIT_I;	}	// * I |= ((size&3)<<20)
-	//	VQDMULL			{	DECL_Id(0xF2800D00);	SET_Vdnm;	EMIT_I;	}	// * I |= ((size&3)<<20)
-
-
-
- 
-
-
-
-/*
- *	A.SIMD misc
- *
-	Vector Absolute Difference and Accumulate						VABA, VABAL
-	Vector Absolute Difference										VABD, VABDL (integer) ,	VABD (floating-point)
-	Vector Absolute													VABS
-	Vector Convert between floating-point and fixed point			VCVT (between floating-point and fixed-point, Advanced SIMD)
-	Vector Convert between floating-point and integer				VCVT (between floating-point and integer, Advanced SIMD)
-	Vector Convert between half-precision and single-precision		VCVT (between half-precision and single-precision, Advanced	SIMD)
-	Vector Count Leading Sign Bits									VCLS
-	Vector Count Leading Zeros										VCLZ
-	Vector Count Set Bits											VCNT
-	Vector Duplicate scalar											VDUP (scalar)
-	Vector Extract													VEXT
-	Vector Move and Narrow											VMOVN
-	Vector Move Long												VMOVL
-	Vector Maximum, Minimum											VMAX, VMIN (integer) ,	VMAX, VMIN (floating-point)
-	Vector Negate													VNEG
-	Vector Pairwise Maximum, Minimum								VPMAX, VPMIN (integer) , VPMAX, VPMIN (floating-point)
-	Vector Reciprocal Estimate										VRECPE
-	Vector Reciprocal Step											VRECPS
-	Vector Reciprocal Square Root Estimate							VRSQRTE
-	Vector Reciprocal Square Root Step								VRSQRTS
-	Vector Reverse													VREV16, VREV32, VREV64
-	Vector Saturating Absolute										VQABS
-	Vector Saturating Move and Narrow								VQMOVN, VQMOVUN
-	Vector Saturating Negate										VQNEG
-	Vector Swap														VSWP
-	Vector Table Lookup												VTBL, VTBX
-	Vector Transpose												VTRN
-	Vector Unzip													VUZP
-	Vector Zip														VZIP
-*/
-	//	VABA			{	DECL_Id(0xF2000710);		// WIP
-	//	VABAL			{	DECL_Id(0xF2800500);
-
-	//	VABD  I			{	DECL_Id(0xF);
-	//	VABDL I			{	DECL_Id(0xF);
-	
-	//	VABD  F			{	DECL_Id(0xF);
-
-	//	VABS			{	DECL_Id(0xF);	SET_Vd;	SET_Vm;		EMIT_I;	}
-	
-	EAPI VSQRT_F32(eFSReg Sd, eFSReg Sm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x0EB10AC0);	SET_CC;
-
-		I |= ((Sd&0x1E)<<11) | ((Sd&1)<<22);
-		I |= ((Sm&0x1E)>>1)  | ((Sm&1)<<5);
-		EMIT_I;
-	}
-
-	EAPI VABS_F32(eFSReg Sd, eFSReg Sm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x0EB00AC0);	SET_CC;
-
-		I |= ((Sd&0x1E)<<11) | ((Sd&1)<<22);
-		I |= ((Sm&0x1E)>>1)  | ((Sm&1)<<5);
-		EMIT_I;
-	}
-	EAPI VNEG_F32(eFSReg Sd, eFSReg Sm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x0EB10A40);	SET_CC;
-
-		I |= ((Sd&0x1E)<<11) | ((Sd&1)<<22);
-		I |= ((Sm&0x1E)>>1)  | ((Sm&1)<<5);
-		EMIT_I;
-	}
-	
-	//imm move, fpu
-	EAPI VMOV(eFSReg Sd, u32 imm8_fpu, ConditionCode CC=AL)
-	{
-		DECL_Id(0x0EB10A00);	SET_CC;
-
-		I |= (imm8_fpu&0x0F);		//bits 3:0
-		I |= (imm8_fpu&0xF0)<<12;	//bits 19:16
-
-		I |= ((Sd&0x1E)<<11) | ((Sd&1)<<22);
-		EMIT_I;
-	}
-
-	const u32 fpu_imm_1=0x70;//01110000
-
-	EAPI VCMP_F32(eFSReg Sd, eFSReg Sm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x0EB40A40);	SET_CC;
-
-		I |= ((Sd&0x1E)<<11) | ((Sd&1)<<22);
-		I |= ((Sm&0x1E)>>1)  | ((Sm&1)<<5);
-		EMIT_I;
-	}
-
-	VdpInstrF(CEQ,	0xF2000E00)
-	VdpInstrF(CGE,	0xF3000E00)
-	VdpInstrF(CGT,	0xF3200E00)
-
-	//	VCVT FFP		{	DECL_Id(0xF);	SET_Vd;	SET_Vm;		EMIT_I;	}
-	//	VCVT FI			{	DECL_Id(0xF);	SET_Vd;	SET_Vm;		EMIT_I;	}
-	//	VCVT HS			{	DECL_Id(0xF);	SET_Vd;	SET_Vm;		EMIT_I;	}
-
-	//	VCLS			{	DECL_Id(0xF);	SET_Vd;	SET_Vm;		EMIT_I;	}
-	//	VCLZ			{	DECL_Id(0xF);	SET_Vd;	SET_Vm;		EMIT_I;	}
-	//	VCNT			{	DECL_Id(0xF);	SET_Vd;	SET_Vm;		EMIT_I;	}
-
-
-	//	VEXT			{	DECL_Id(0xF);	SET_Vdnm;	EMIT_I;	}
-
-	//	VMAX I			{	DECL_Id(0xF);
-	//	VMIN I			{	DECL_Id(0xF);
-	//	VMAX F			{	DECL_Id(0xF);
-	//	VMIN F			{	DECL_Id(0xF);
-	//	VNEG			{	DECL_Id(0xF);
-
-	//	VPMAX I			{	DECL_Id(0xF);
-	//	VPMIN I			{	DECL_Id(0xF);
-	//	VPMAX F			{	DECL_Id(0xF);
-	//	VPMIN F			{	DECL_Id(0xF);
-
-	//	VRECPE			{	DECL_Id(0xF3B30400);	SET_Vd;	SET_Vm;		EMIT_I;	}		// size&3<<18
-	//	VRECPS			{	DECL_Id(0xF2000F10);	SET_Vdnm;			EMIT_I;	}		// sz&1<<20		(.F32)
-	//	VRSQRTE			{	DECL_Id(0xF3B30480);	SET_Vd;	SET_Vm;		EMIT_I;	}		// size&3<<18	F&1<<8		***
-	//	VRSQRTS			{	DECL_Id(0xF2200F10);	SET_Vdnm;			EMIT_I;	}		// sz&1<<20		(.F32)
-	//	VREVsz			{	DECL_Id(0xF3B00000);	SET_Vd;	SET_Vm;		EMIT_I;	}		// size&3<<18	op&3<<7		***	
-
-	//	VQABS			{	DECL_Id(0xF3B00700);	SET_Vd;	SET_Vm;		EMIT_I;	}		// size&3<<18
-	//	VQMOVN			{	DECL_Id(0xF3B20200);	SET_Vd;	SET_Vm;		EMIT_I;	}		// size&3<<18	op&3<<6	op:00=MOVN op11=srcUnsigned op:x1=dstUnsigned
-	//	VQMOVUN			{	DECL_Id(0xF3B20200);	SET_Vd;	SET_Vm;		EMIT_I;	}		// size&3<<18
-	//	VQNEG			{	DECL_Id(0xF3B00780);	SET_Vd;	SET_Vm;		EMIT_I;	}		// size&3<<18
-
-	//	VSWP			{	DECL_Id(0xF3B20000);	SET_Vd;	SET_Vm;		EMIT_I;	}		// size&3<<18
-	//	VTBL			{	DECL_Id(0xF3B00800);	SET_Vdnm;			EMIT_I;	}		// len&3<<8
-	//	VTBX			{	DECL_Id(0xF3B00840);	SET_Vdnm;			EMIT_I;	}		// len&3<<8
-	//	VTRN			{	DECL_Id(0xF3B20080);	SET_Vd;	SET_Vm;		EMIT_I;	}		// size&3<<18
-	//	VUZP			{	DECL_Id(0xF3B20100);	SET_Vd;	SET_Vm;		EMIT_I;	}		// size&3<<18
-	//	VZIP			{	DECL_Id(0xF3B20180);	SET_Vd;	SET_Vm;		EMIT_I;	}		// size&3<<18
-	//	
-
-
-//	VDUP	&	VMOVN	&	VMOVL	are implemented in VRegXfer.h ...
-
-
-
-
-
-
-	/*
-	 *	VFPv3 Instructions 
-	 *
-	 */
-
-
-
-
-#define SET_Sd					\
-	I |= ((Sd&0x1E)<<11);		\
-	I |= ((Sd&0x01)<<22)
-
-#define SET_Sn					\
-	I |= ((Sn&0x1E)<<15);		\
-	I |= ((Sn&0x01)<<7)
-
-#define SET_Sm					\
-	I |= ((Sm&0x1E)>>1);		\
-	I |= ((Sm&0x01)<<5)
-
-
-
-#define SET_Sdnm	SET_Sd; SET_Sn; SET_Sm
-
-
-#define VfpInstrS(viName, viId)		EAPI V##viName##_VFP	(eFSReg Sd, eFSReg Sn, eFSReg Sm, ConditionCode CC=CC_AL)  {   DECL_Id(viId);  SET_CC;	SET_Sdnm;   EMIT_I; }
-
-	VfpInstrS(MLA,	0x0E000A00)
-	VfpInstrS(MLS,	0x0E000A40)
-
-	VfpInstrS(NMLA,	0x0E100A40)
-	VfpInstrS(NMLS,	0x0E100A00)
-	VfpInstrS(NMUL,	0x0E200A40)
-
-
-	VfpInstrS(MUL,	0x0E200A00)
-
-	VfpInstrS(ADD,	0x0E300A00)
-	VfpInstrS(SUB,	0x0E300A40)
-
-	VfpInstrS(DIV,	0x0E800A00)
-
-	
-	EAPI VCVT_to_S32_VFP (eFSReg Sd, eFSReg Sm, ConditionCode CC=CC_AL)  {   DECL_Id(0x0EBD0AC0);  SET_CC;	SET_Sd; SET_Sm;   EMIT_I; }		//	VfpInstrS(ABS,	0x0EB00AC0)		** {D,S}dm
-	// 0x0EB80A40 is to_U32. to_S32 is 0x0EB80AC0
-	EAPI VCVT_from_S32_VFP (eFSReg Sd, eFSReg Sm, ConditionCode CC=CC_AL)  {   DECL_Id(0x0EB80AC0);  SET_CC;	SET_Sd; SET_Sm;   EMIT_I; }		//	VfpInstrS(ABS,	0x0EB00AC0)		** {D,S}dm
-
-	EAPI VABS_VFP (eFSReg Sd, eFSReg Sm, ConditionCode CC=CC_AL)  {   DECL_Id(0x0EB00AC0);  SET_CC;	SET_Sd; SET_Sm;   EMIT_I; }		//	VfpInstrS(ABS,	0x0EB00AC0)		** {D,S}dm
-	EAPI VNEG_VFP (eFSReg Sd, eFSReg Sm, ConditionCode CC=CC_AL)  {   DECL_Id(0x0EB10A40);  SET_CC;	SET_Sd; SET_Sm;   EMIT_I; }		//	VfpInstrS(NEG,	0x0EB10A40)		** {D,S}dm
-	EAPI VSQRT_VFP(eFSReg Sd, eFSReg Sm, ConditionCode CC=CC_AL)  {   DECL_Id(0x0EB10AC0);  SET_CC;	SET_Sd; SET_Sm;   EMIT_I; }		//	VfpInstrS(SQRT,	0x0EB10AC0)		** {D,S}dm
-
-//	- x0 Vector Move VMOV (immediate) on page A8-640
-//	0000 01 Vector Move VMOV (register) on page A8-642
-
-//	001x x1 Vector Convert VCVTB, VCVTT (between half-precision and single-precision, VFP) on page A8-588
-//	010x x1 Vector Compare VCMP, VCMPE on page A8-572
-//	0111 11 Vector Convert VCVT (between double-precision and single-precision) on page A8-584
-//	1000 x1 Vector Convert VCVT, VCVTR (between floating-point and integer, VFP) on page A8-578
-//	101x x1 Vector Convert VCVT (between floating-point and fixed-point, VFP) on page A8-582
-//	110x x1 Vector Convert VCVT, VCVTR (between floating-point and integer, VFP) on page A8-578
-//	111x x1 Vector Convert VCVT (between floating-point and fixed-point, VFP) on page A8-582
-
-	////// hack
-
-	EAPI VDIV_HACKF32(eFDReg Sd, eFDReg Sn, eFDReg Sm)
-	{
-		ConditionCode CC=AL;
-
-		eFSReg SdS=(eFSReg)(Sd*2);
-		eFSReg SnS=(eFSReg)(Sn*2);
-		eFSReg SmS=(eFSReg)(Sm*2);
-
-		verify(Sd<32 && Sn<32 && Sm<32);
-
-		VDIV_VFP(SdS,SnS,SmS);
-	}
-
-
-
-
-
-
-
-
-
-
-
-
-
-	
-
-
-
-#undef SET_Qd
-#undef SET_Dd
-
-#undef SET_Qn
-#undef SET_Dn
-
-#undef SET_Qm
-#undef SET_Dm
-
-#undef SET_Q
-
-#undef SET_Qdnm
-#undef SET_Ddnm
-
-
-
-};
@@ -1,210 +0,0 @@
-/*
- *	E_VLoadStore.h		* VFP/A.SIMD Load/Store Instruction Set Encoding
- *
- */
-#pragma once
-
-
-namespace ARM
-{
-	
-	//	[cond][110][Opcode][-Rn-][----][101][---------]
-	//
-	//	cond != 0b1111	| LDC && STC consume these
-
-
-
-#define SET_Dd	\
-	I |= ((Dd&0x0F)<<12);	\
-	I |= ((Dd&0x10)<<18)
-
-#define SET_Sd	\
-	I |= ((Sd&0x1E)<<11);	\
-	I |= ((Sd&0x01)<<22)
-
-
-#define SET_Rn	\
-	I |= ((Rn&15)<<16)
-
-#define SET_uImm8		\
-	I |= (uImm8 & 255)
-
-#define SET_sImm8		\
-	if (sImm8 > 0) {	\
-		I |= (1<<23);	\
-	}					\
-	I |= (abs(sImm8) & 255)
-
-
-#define SET_PUW(_P,_U,_W)	\
-	I |= ( ((_P&1)<<24) | ((_U&1)<<23) | ((_W&1)<<21) )
-
-
-
-
-	/*
-	 *	V{LD,ST}R:	Vector Load/Store Register
-	 *
-	 *		V{LD,ST}R.64		// VFP && A.SIMD
-	 *		V{LD,ST}R.32		// VFP
-	 */
-
-	EAPI VLDR(eFDReg Dd, eReg Rn, s32 sImm8, ConditionCode CC=AL)	// VLDR.64
-	{
-		DECL_Id(0x0D100B00);	SET_CC;
-		SET_Dd;		SET_Rn;		SET_sImm8;
-		EMIT_I;
-	}
-
-	EAPI VLDR(eFSReg Sd, eReg Rn, s32 sImm8, ConditionCode CC=AL)	// VLDR.32
-	{
-		DECL_Id(0x0D100A00);	SET_CC;
-		SET_Sd;		SET_Rn;		SET_sImm8;
-		EMIT_I;
-	}
-
-
-	EAPI VSTR(eFDReg Dd, eReg Rn, s32 sImm8, ConditionCode CC=AL)	// VSTR.64
-	{
-		DECL_Id(0x0D000B00);	SET_CC;
-		SET_Dd;		SET_Rn;		SET_sImm8;
-		EMIT_I;
-	}
-
-	EAPI VSTR(eFSReg Sd, eReg Rn, s32 sImm8, ConditionCode CC=AL)	// VSTR.32
-	{
-		DECL_Id(0x0D000A00);	SET_CC;
-		SET_Sd;		SET_Rn;		SET_sImm8;
-		EMIT_I;
-	}
-
-	
-
-	/*
-	 *	V{LD,ST}M:	Vector Load/Store Multiple
-	 *
-	 *		V{LD,ST}R.64		// VFP && A.SIMD
-	 *		V{LD,ST}R.32		// VFP
-	 *
-	 *	uImm8:	directional count, abs(sImm8) is the reg. count
-	 *	Dd:		Register to start sequential operation from..
-	 *
-	 *	suffix DB:	P=1 U=0 W=1,	Decrement Before,	Addresses end just before the address in Rn.
-	 *	suffix IA:	P=0 U=1 W=?,	Increment After,	Addresses start at address in Rn
-	 *
-	 *	** These are very complicated encoding and require a lot of error checking and even more thought when used. **
-	 *	** Simply using,  MOV32(R4, &double_array[0]);	VLDM(D0, R4, 4);  should however work to load an array of 4 doubles **
-	 */
-
-	EAPI VLDM(eFDReg Dd, eReg Rn, u32 uImm8, u32 WB=0, ConditionCode CC=AL)	// VLDM.64
-	{
-		// ASSERT( (uImm8>0) && (uImm8<=16) && ((Dd+uImm8) <= 32) )
-		uImm8<<=1;
-		DECL_Id(0x0C100B00);	SET_CC;
-		SET_Dd;		SET_Rn;
-		SET_uImm8;	SET_PUW(0,1,WB);			// Defaulting to IA w/o ! (Write-back)
-		EMIT_I;
-	}
-
-	EAPI VLDM(eFSReg Sd, eReg Rn, u32 uImm8, ConditionCode CC=AL)	// VLDM.32
-	{
-		// ASSERT( (uImm8>0) && ((Dd+uImm8) <= 32) )
-		DECL_Id(0x0C100A00);	SET_CC;
-		SET_Sd;		SET_Rn;
-		SET_uImm8;	SET_PUW(0,1,0);			// Defaulting to IA w/o ! (Write-back)
-		EMIT_I;
-	}
-
-
-	EAPI VSTM(eFDReg Dd, eReg Rn, u32 uImm8, ConditionCode CC=AL)	// VSTM.64
-	{
-		// ASSERT( (uImm8>0) && (uImm8<=16) && ((Dd+uImm8) <= 32) )
-		uImm8<<=1;
-		DECL_Id(0x0C000B00);	SET_CC;
-		SET_Dd;		SET_Rn;
-		SET_uImm8;	SET_PUW(0,1,0);			// Defaulting to IA w/o ! (Write-back)
-		EMIT_I;
-	}
-
-	EAPI VSTM(eFSReg Sd, eReg Rn, u32 uImm8, ConditionCode CC=AL)	// VSTM.32
-	{
-		// ASSERT( (uImm8>0) && ((Dd+uImm8) <= 32) )
-		DECL_Id(0x0C000A00);	SET_CC;
-		SET_Sd;		SET_Rn;
-		SET_uImm8;	SET_PUW(0,1,0);			// Defaulting to IA w/o ! (Write-back)
-		EMIT_I;
-	}
-
-
-
-
-	/*
-	 *	V{LD,ST}n:	Various extra load/store multiple.
-	 *
-	 *		Not Implemented.
-	 *
-	 */
-
-
-
-
-
-
-	/*
-	 *	VPUSH/VPOP:	Vector Load/Store multiple consecutive vector registers to the stack.
-	 *
-	 *	V{PUSH,POP}	.64: A.SIMD		.32 VFP
-	 */
-
-	EAPI VPUSH(eFDReg Dd, eReg Rn, u32 uImm8, ConditionCode CC=AL)	// VPUSH.64
-	{
-		uImm8<<=1;
-		DECL_Id(0x0D2D0B00);	SET_CC;
-		SET_Dd;		SET_uImm8;
-		EMIT_I;
-	}
-
-	EAPI VPUSH(eFSReg Sd, eReg Rn, u32 uImm8, ConditionCode CC=AL)	// VPUSH.32
-	{
-		DECL_Id(0x0D2D0A00);	SET_CC;
-		SET_Sd;		SET_uImm8;
-		EMIT_I;
-	}
-
-
-	EAPI VPOP(eFDReg Dd, eReg Rn, u32 uImm8, ConditionCode CC=AL)	// VPOP.64
-	{
-		uImm8<<=1;
-		DECL_Id(0x0CBD0B00);	SET_CC;
-		SET_Dd;		SET_uImm8;
-		EMIT_I;
-	}
-
-	EAPI VPOP(eFSReg Sd, eReg Rn, u32 uImm8, ConditionCode CC=AL)	// VPOP.32
-	{
-		DECL_Id(0x0CBD0A00);	SET_CC;
-		SET_Sd;		SET_uImm8;
-		EMIT_I;
-	}
-
-
-
-
-	/*
-	 *	Best practice is to remove macro definitions,
-	 *	this way they can't affect subsequent headers.
-	 */
-
-#undef SET_Dd
-#undef SET_Sd
-
-#undef SET_Rn
-
-#undef SET_uImm8
-#undef SET_sImm8
-
-#undef SET_PUW
-
-
-
-};
@@ -1,344 +0,0 @@
-/*
- *	E_VRegXfer.h		* VFP/A.SIMD Register Transfer Instruction Set Encoding
- *
- */
-#pragma once
-
-
-namespace ARM
-{
-
-
-
-	/////// REPLACE THIS MESS W.  SET_Rto16 / SET_Rto16_H22 ,  SET_Rto12 ,  SET_Rto0_H5  OR just leave it all in the fn's //////
-
-
-#define SET_Qd	\
-	I |= (((Qd<<1)&0x0E)<<16);	\
-	I |= (((Qd<<1)&0x10)<<3)
-
-#define SET_Qm	\
-	I |= (((Qm<<1)&0x0E));	\
-	I |= (((Qm<<1)&0x10)<<1)
-
-
-#define SET_Dd	\
-	I |= ((Dd&0x0F)<<16);	\
-	I |= ((Dd&0x10)<<3)
-
-#define SET_Dm	\
-	I |= ((Dm&0x0F));		\
-	I |= ((Dm&0x10)<<1)
-
-
-#define SET_Sn	\
-	I |= ((Sn&0x1E)<<15);	\
-	I |= ((Sn&0x01)<<7)
-
-#define SET_Sm	\
-	I |= ((Sm&0x1E)>>1);	\
-	I |= ((Sm&0x01)<<5)
-
-
-#define SET_Rn	\
-	I |= ((Rn&15)<<16)
-
-#define SET_Rt	\
-	I |= ((Rt&15)<<12)
-
-#define SET_Rtx2	\
-	I |= ((Rt&15)<<12) | ((Rt2&15)<<16)
-
-	// VDUP VMOV VMRS VMSR
-
-	/*
-	 *	VDUP.SZ:	Duplicates an element from ARM reg Rt into every element of {Q,D}d		A.SIMD
-	 *
-	 */
-	EAPI VDUP(eFQReg Qd, eReg Rt, u32 Size=32, ConditionCode CC=AL)
-	{
-		DECL_Id(0x0E800B10);	SET_CC;
-		SET_Qd;		SET_Rt;		I |= (1<<21);	// Q
-		if (Size==16)	{ I |= (1<<5);  }		// e
-		if (Size==8)	{ I |= (1<<22); }		// b
-		EMIT_I;
-	}
-
-	EAPI VDUP(eFDReg Dd, eReg Rt, u32 Size=32, ConditionCode CC=AL)
-	{
-		DECL_Id(0x0E800B10);	SET_CC;
-		SET_Dd;		SET_Rt;		// No Q
-		if (Size==16)	{ I |= (1<<5);  }	// e
-		if (Size==8)	{ I |= (1<<22); }	// b
-		EMIT_I;
-	}
-
-	EAPI VDUP8 (eFQReg Qd, eReg Rt, ConditionCode=AL)	{ VDUP(Qd,Rt,8, CC); }
-	EAPI VDUP8 (eFDReg Dd, eReg Rt, ConditionCode=AL)	{ VDUP(Dd,Rt,8, CC); }
-	EAPI VDUP16(eFQReg Qd, eReg Rt, ConditionCode=AL)	{ VDUP(Qd,Rt,16,CC); }
-	EAPI VDUP16(eFDReg Dd, eReg Rt, ConditionCode=AL)	{ VDUP(Dd,Rt,16,CC); }
-	EAPI VDUP32(eFQReg Qd, eReg Rt, ConditionCode=AL)	{ VDUP(Qd,Rt,32,CC); }
-	EAPI VDUP32(eFDReg Dd, eReg Rt, ConditionCode=AL)	{ VDUP(Dd,Rt,32,CC); }
-
-	EAPI VDUP32(eFQReg Qd, eFDReg Dm, int idx)	
-	{
-		DECL_Id(0xF3B00C00);
-		
-		//Set_Qd seems to be incompitable here ?
-		I |= (((Qd<<1)&0x0E)<<12);	\
-		I |= (((Qd<<1)&0x10)<<18);
-		SET_Dm;
-		I |= 0x40;	//SET_Q
-		I |= 0x4 << 16;	// 32 bits 4=0100
-		I |= (idx&1) << 19;	// set idx 
-
-		EMIT_I;
-	}
-
-
-
-
-	/*
-	 *	VMOV:	(register)
-	 *
-	 *		VMOV { <Qd, Qm> , <Dd, Dm> }		A.SIMD
-	 *		VMOV { <Dd, Dm> , <Sd, Sm> }		VFP		sz1 UNDEFINED in single only VFP
-	 */
-
-	EAPI VMOV(eFQReg Qd, eFQReg Qm)	// UNCONDITIONAL
-	{
-		DECL_Id(0xF2200110);
-
-		I |= ((Qd&0x0F)<<12) | ((Qd&0x10)<<18);
-		I |= ((Qm&0x0F)<<16) | ((Qm&0x10)<<1);	// If !Consistent(M:Qm) then its VORR
-		I |= ((Qm&0x0F))     | ((Qm&0x10)<<3);	// If !Consistent(M:Qm) then its VORR
-		EMIT_I;
-	}
-
-	EAPI VMOV(eFDReg Dd, eFDReg Dm)	// UNCONDITIONAL
-	{
-		DECL_Id(0xF2200110);
-
-		I |= ((Dd&0x0F)<<12) | ((Dd&0x10)<<18);
-		I |= ((Dm&0x0F)<<16) | ((Dm&0x10)<<3);	// If !Consistent(M:Dm) then its VORR
-		I |= ((Dm&0x0F))     | ((Dm&0x10)<<1);	// If !Consistent(M:Dm) then its VORR
-		EMIT_I;
-	}
-
-
-//	EAPI VMOV(eFDReg Dd, eFDReg Dm, ConditionCode CC=AL)	{}		VFP Double Version Not Implemented here for obvious reasons : same as below except would set SZ @bit8 : 0x0EB00B40
-
-	EAPI VMOV(eFSReg Sd, eFSReg Sm, ConditionCode CC=AL)
-	{
-		DECL_Id(0x0EB00A40);	SET_CC;
-
-		I |= ((Sd&0x1E)<<11) | ((Sd&1)<<22);
-		I |= ((Sm&0x1E)>>1)  | ((Sm&1)<<5);
-		EMIT_I;
-	}
-
-
-
-	/*
-	 *	VMOV:	(Immediate)		A.SIMD / VFP
-	 *
-	 */
-
-	//// TO BE IMPLEMENTED ////
-
-
-
-
-	/*
-	 *	VMOV:	(ARM to scalar)		A.SIMD / VFP IF Size=32
-	 *
-	 */
-	EAPI VMOV(eFDReg Dd, u32 Index, eReg Rt, u32 Size=32, ConditionCode CC=AL)
-	{
-		DECL_Id(0x0E000B10);	SET_CC;
-		SET_Dd;		SET_Rt;
-		// Dd[x]  where x==Index  Dd is 64b, 2x32[0,1](1bit) 4x16[0-3](2bits) 8x8[0-7](3bits)
-		if (Size== 8) { I |= (1<<22) | ((Index&4)<<18) | ((Index&3)<<5) ;	}	// x -> opc1:0, opc2	(3bits)	| opc1:1 SET
-		if (Size==16) { I |= (1<<5) | ((Index&2)<<20) | ((Index&1<<6)) ;	}	// x -> opc1:0, opc2:1	(2bits)	| opc2:0 SET
-		if (Size==32) { I |= ((Index&1)<<21) ;								}	// x -> opc1:0			(1bit)	
-		EMIT_I;
-	}
-
-	
-
-	/*
-	 *	VMOV:	(scalar to ARM)		A.SIMD / VFP IF Size=32
-	 *
-	 *	Note: U (bit32) is unsigned bit,  invalid for 32b and we do not handle it at all.. might want to set it for byte,short
-	 */
-	EAPI VMOV(eReg Rt, eFDReg Dd, u32 Index, u32 Size=32, ConditionCode CC=AL)	// This is really Vn, but we'll use the same macros..
-	{
-		DECL_Id(0x0E100B10);	SET_CC;
-		SET_Dd;		SET_Rt;
-		// Dd[x]  where x==Index  Dd is 64b, 2x32[0,1](1bit) 4x16[0-3](2bits) 8x8[0-7](3bits)
-		if (Size== 8) { I |= (1<<22) | ((Index&4)<<18) | ((Index&3)<<5) ;	}	// x -> opc1:0, opc2	(3bits)	| opc1:1 SET
-		if (Size==16) { I |= (1<<5) | ((Index&2)<<20) | ((Index&1<<6)) ;	}	// x -> opc1:0, opc2:1	(2bits)	| opc2:0 SET
-		if (Size==32) { I |= ((Index&1)<<21) ;								}	// x -> opc1:0			(1bit)	
-		EMIT_I;
-	}
-
-	
-	
-
-	/*
-	 *	VMOV:	(between ARM and single either direction)		VFP
-	 *
-	 */
-	EAPI VMOV(eReg Rt, eFSReg Sn, ConditionCode CC=AL)	// Sn !d
-	{
-		DECL_Id(0x0E000A10);	SET_CC;
-		SET_Sn;		SET_Rt;		I |= (1<<20);	// op set = TO ARM reg
-		EMIT_I;
-	}
-	EAPI VMOV(eFSReg Sn, eReg Rt, ConditionCode CC=AL)	// Sn !d
-	{
-		DECL_Id(0x0E000A10);	SET_CC;
-		SET_Sn;		SET_Rt;		// op NOT set = TO FP Single reg
-		EMIT_I;
-	}
-
-	
-	
-	
-
-	/*
-	 *	VMOV:	(between two ARM regs and two contiguous singles either direction)		VFP
-	 *
-	 */
-	EAPI VMOV(eReg Rt, eReg Rt2, eFSReg Sm, ConditionCode CC=AL)	// Sn !d
-	{
-		DECL_Id(0x0E000A10);	SET_CC;
-		SET_Sm;		SET_Rtx2;		I |= (1<<20);	// op set = TO ARM regs
-		EMIT_I;
-	}
-	EAPI VMOV(eFSReg Sm, eReg Rt, eReg Rt2, ConditionCode CC=AL)	// Sn !d
-	{
-		DECL_Id(0x0E000A10);	SET_CC;
-		SET_Sm;		SET_Rtx2;		// op NOT set = TO FP Single(s)
-		EMIT_I;
-	}
-
-	
-	
-	
-
-	/*
-	 *	VMOV:	(between two ARM regs and a Double)	Dm <-> Rt2:Rt	A.SIMD/VFP
-	 *
-	 */
-	EAPI VMOV(eReg Rt, eReg Rt2, eFDReg Dm, ConditionCode CC=AL)	// Sn !d
-	{
-		DECL_Id(0x0C400B10);	SET_CC;
-		SET_Dm;		SET_Rtx2;		I |= (1<<20);	// op set = TO ARM regs
-		EMIT_I;
-	}
-	EAPI VMOV(eFDReg Dm, eReg Rt, eReg Rt2, ConditionCode CC=AL)	// Sn !d
-	{
-		DECL_Id(0x0C400B10);	SET_CC;
-		SET_Dm;		SET_Rtx2;		// op NOT set = TO FP Single(s)
-		EMIT_I;
-	}
-
-	
-	
-
-	/*
-	 *	VMOVL:	Takes each element in a VDouble && Sign or Zero extends into a VQuad	A.SIMD
-	 *
-	 */
-	EAPI VMOVL(eFQReg Qd, eFDReg Dm, u32 Size=32, u32 Sign=0)	// UNCONDITIONAL	Q & ~1
-	{
-		Size >>= 3;				// Sz/8 = 1,2 or 4	else if >0 its VSHLL
-		Sign = (Sign>0)?0:1;	// Invert to Unsigned
-		DECL_Id(0xF2800A10);
-
-		SET_Dm;
-		I |= ((Qd&0x0F)<<12);
-		I |= ((Qd&0x10)<<18);
-		I |= ((Size &7)<<19);	// imm3
-		I |= ((Sign &1)<<24);	// U
-		EMIT_I;
-	}
-
-	EAPI VMOVL_S8 (eFQReg Qd, eFDReg Dm)	{ VMOVL(Qd,Dm,8,1);		}
-	EAPI VMOVL_U8 (eFQReg Qd, eFDReg Dm)	{ VMOVL(Qd,Dm,8,0);		}
-	EAPI VMOVL_S16(eFQReg Qd, eFDReg Dm)	{ VMOVL(Qd,Dm,16,1);	}
-	EAPI VMOVL_U16(eFQReg Qd, eFDReg Dm)	{ VMOVL(Qd,Dm,16,0);	}
-	EAPI VMOVL_S32(eFQReg Qd, eFDReg Dm)	{ VMOVL(Qd,Dm,32,1);	}
-	EAPI VMOVL_U32(eFQReg Qd, eFDReg Dm)	{ VMOVL(Qd,Dm,32,0);	}
-
-	
-	
-	
-
-	/*
-	 *	VMOVN:	Copies least significant half of each element of a VQuad into the elements of a VDouble 	A.SIMD
-	 *
-	 */
-	EAPI VMOVN(eFDReg Dd, eFQReg Qm, u32 Size=32)	// UNCONDITIONAL	Q & ~1
-	{
-		Size >>= 4;				// Sz/32 = 0,1 or 2
-		DECL_Id(0xF3B20200);
-
-		SET_Qm;
-		I |= ((Dd&0x0F)<<12);
-		I |= ((Dd&0x10)<<18);
-		I |= ((Size &3)<<18);	// size
-		EMIT_I;
-	}
-
-	EAPI VMOVN16(eFDReg Dd, eFQReg Qm)	{ VMOVN(Dd,Qm,16);	}
-	EAPI VMOVN32(eFDReg Dd, eFQReg Qm)	{ VMOVN(Dd,Qm,32);	}
-	EAPI VMOVN64(eFDReg Dd, eFQReg Qm)	{ VMOVN(Dd,Qm,64);	}
-
-
-
-
-
-
-
-	/*
-	 *	VM{RS,SR}	Move ARM reg To/From FPSCR		A.SIMD/VFP
-	 */
-	EAPI VMRS(eReg Rt, ConditionCode CC=AL)
-	{
-		DECL_Id(0x0EF10A10);
-		SET_CC;		SET_Rt;
-		EMIT_I;
-	}
-	EAPI VMSR(eReg Rt, ConditionCode CC=AL)
-	{
-		DECL_Id(0x0EE10A10);
-		SET_CC;		SET_Rt;
-		EMIT_I;
-	}
-
-
-
-
-
-
-
-
-
-
-#undef SET_Qd
-#undef SET_Qm
-
-#undef SET_Dd
-#undef SET_Dm
-
-#undef SET_Sn
-#undef SET_Sm
-
-#undef SET_Rn
-#undef SET_Rt
-#undef SET_Rtx2
-
-	
-};
@@ -1,75 +0,0 @@
-/*
- *	H_Branches.h
- *
- *
- */
-#pragma once
-
-
-
-
-namespace ARM
-{
-
-
-
-	inline static snat Literal(unat FnAddr)
-	{
-		u8* pc_addr = (u8*)EMIT_GET_PTR();
-		return (snat)((snat)FnAddr - ((snat)pc_addr+8));
-		//return -(snat)((pc_addr+8)-(snat)FnAddr);
-	}
-
-	EAPI CALL(unat FnAddr, ConditionCode CC=AL)
-	{
-		snat lit = Literal(FnAddr);
-
-		if(0==lit) {
-			printf("Error, Compiler caught NULL literal, CALL(%08X)\n", FnAddr);
-			verify(false);
-			return;
-		}
-		if( (lit<-33554432) || (lit>33554428) )     // ..28 for BL ..30 for BLX
-		{
-			printf("Warning, CALL(%08X) is out of range for literal(%08X)\n", FnAddr, lit);
-			// verify(false);
-
-			MOV32(IP, FnAddr, CC);
-			BLX(IP, CC);
-			return;
-		}
-
-		BL(lit,CC);
-	}
-
-
-
-	EAPI JUMP(unat FnAddr, ConditionCode CC=AL)
-	{
-		snat lit = Literal(FnAddr);
-
-		/*if(0==lit) {
-			printf("Error, Compiler caught NULL literal, JUMP(%08X)\n", FnAddr);
-			verify(false);
-			return;
-		}*/
-		if( (lit<-33554432) || (lit>33554428) )     // ..28 for BL ..30 for BLX
-		{
-			printf("Warning, %X is out of range for imm jump! \n", FnAddr);
-			//verify(false);
-
-			MOV32(IP, FnAddr, CC);
-			BX(IP, CC);
-			return;
-		}
-
-		B(lit,CC);     // Note, wont work for THUMB*,  have to use bx which is reg only !
-	}
-
-
-
-}
-
-
-
-
@@ -1,150 +0,0 @@
-/*
- *	H_LoadStore.h
- *
- *
- */
-#pragma once
-
-
-
-namespace ARM
-{
-
-	/*
-	 *	Load Helpers
-	 */
-
-	EAPI LoadImmBase(eReg Rt, u32 Base, ConditionCode CC=AL)
-	{
-		MOV32(Rt, Base, CC);
-
-#if defined(_DEVEL)
-		LDR(Rt,Rt,0, Offset, CC);
-#else
-		LDR(Rt,Rt,0, CC);
-#endif
-	}
-
-	EAPI LoadImmBase(eReg Rt, eReg Rn, u32 Base, ConditionCode CC=AL)
-	{
-		MOV32(Rn, Base, CC);
-
-#if defined(_DEVEL)
-		LDR(Rt,Rn,0, Offset, CC);
-#else
-		LDR(Rt,Rn,0, CC);
-#endif
-	}
-
-	EAPI LoadImmBase16(eReg Rt, u32 Base, bool Extend=false, ConditionCode CC=AL)
-	{
-		MOV32(Rt, Base, CC);
-		LDRH(Rt,Rt,0, CC);
-
-		if(Extend)
-			SXTH(Rt,Rt);
-	}
-
-	EAPI LoadImmBase16(eReg Rt, eReg Rn, u32 Base, bool Extend=false, ConditionCode CC=AL)
-	{
-		MOV32(Rn, Base, CC);
-		LDRH(Rt,Rn,0, CC);
-
-		if(Extend)
-			SXTH(Rt,Rt);
-	}
-
-	
-
-	/*
-	 *	Store Helpers
-	 */
-
-	// you pick regs, loads Base with reg addr, you supply data in Rt
-	EAPI StoreImmBase(eReg Rt, eReg Rn, u32 Base, ConditionCode CC=AL)
-	{
-		MOV32(Rn, Base, CC);
-
-#if defined(_DEVEL)
-		STR(Rt,Rn,0, Offset, CC);
-#else
-		STR(Rt,Rn,0, CC);
-#endif
-	}
-
-	// you pick regs, loads Rt with const val, you supply base for Rn
-	EAPI StoreImmVal(eReg Rt, eReg Rn, u32 Val, ConditionCode CC=AL)
-	{
-		MOV32(Rt, Val, CC);
-
-#if defined(_DEVEL)
-		STR(Rt,Rn,0, Offset, CC);
-#else
-		STR(Rt,Rn,0, CC);
-#endif
-	}
-
-	// you pick regs, loads Base with reg addr, loads Rt with const val
-	EAPI StoreImms(eReg Rt, eReg Rn, u32 Base, u32 Val, ConditionCode CC=AL)
-	{
-		MOV32(Rn, Base, CC);
-		MOV32(Rt, Val, CC);
-
-#if defined(_DEVEL)
-		STR(Rt,Rn,0, Offset, CC);
-#else
-		STR(Rt,Rn,0, CC);
-#endif
-	}
-
-
-	
-#if defined(_DEVEL) && 0	// These require testing //
-
-	EAPI LoadImmBase8(eReg Rt, u32 Base, bool Extend=false, ConditionCode CC=AL)
-	{
-		MOV32(Rt, Base, CC);
-		LDRB(Rt,Rt,0, CC);
-
-		if(Extend)
-			SXTB(Rt,Rt);
-	}
-
-	EAPI LoadImmBase8(eReg Rt, eReg Rn, u32 Base, bool Extend=false, ConditionCode CC=AL)
-	{
-		MOV32(Rn, Base, CC);
-		LDRB(Rt,Rn,0, CC);
-
-		if(Extend)
-			SXTB(Rt,Rt);
-	}
-
-#endif	// defined(_DEVEL)
-
-
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1,102 +0,0 @@
-/*
- *	H_fp.h
- *
- *		ARMv7 floating point help routines.
- */
-#pragma once
-
-
-			/// WIP ///
-
-
-
-namespace ARM
-{
-
-#if defined(_DEVEL)
-
-
-	/*
-	 *	vfpVersion():	Returns VFP Arch. Version, or -1 if not supported
-	 */
-	int vfpVersion()
-	{
-		//	FPSID bits [22:16] contain version
-
-		return 0;
-	}
-
-	int neonVersion()
-	{
-		//	??
-
-		return 0;
-	}
-
-
-#define VFP_SINGLE		(1<<0)
-#define VFP_DOUBLE		(1<<1)
-#define NEON_INTEGER	(1<<2)
-#define NEON_SINGLE		(1<<3)
-#define VFP_TRAPS		(1<<8)	// VFPv3U
-#define FPEXT_HALF		(1<<16)	// Half precision extension
-
-	u32 fpFeatures()
-	{
-
-
-		return 0;
-	}
-
-
-#endif	// _DEVEL
-
-
-
-
-
-#if 0
-
-Version 1 of the Common VFP subarchitecture has special behavior when the FPSCR.IXE bit is set to 1.
-	The Common VFP subarchitecture version can be identified by checking FPSID bits [22:16]. This field is
-	0b0000001 for version 1. In version 1 of the Common VFP subarchitecture the FPEXC.DEX bit is RAZ/WI.
-
-
-Detecting which VFP Common subarchitecture registers are implemented
-	An implementation can choose not to implement FPINST and FPINST2, if these registers are not required.
-
-Set FPEXC.EX=1 and FPEXC.FP2V=1
-Read back the FPEXC register
-if FPEXC.EX == 0 then
-	Neither FPINST nor FPINST2 are implemented
-else
-	if FPEXC.FP2V == 0 then
-		FPINST is implemented, FPINST2 is not implemented.
-	else
-		Both FPINST and FPINST2 are implemented.
-Clean up
-
-#endif
-
-
-
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1,29 +0,0 @@
-/*
- *	H_psuedo.h
- *
- */
-
-#pragma once
-
-namespace ARM
-{
-
-	EAPI MOV32(eReg Rd, u32 Imm32, ConditionCode CC=AL)
-	{
-		MOVW(Rd,((Imm32)&0xFFFF),CC);
-		if (Imm32>>16)
-			MOVT(Rd,((Imm32>>16)&0xFFFF),CC);
-	}
-#if 0
-	EAPI NEG(eReg Rd,eReg Rs)
-	{
-		RSB(Rd,Rs,0);
-	}
-#endif
-	EAPI NOT(eReg Rd,eReg Rs)
-	{
-		MVN(Rd,Rs);
-	}
-
-
-}
@@ -1,64 +0,0 @@
-/*
- *	H_state.h
- *
- */
-#pragma once
-
-
-namespace ARM
-{
-
-	enum InstructionSet {
-		IS_ARM,
-		IS_Thumb,
-		IS_Jazelle,
-		IS_ThumbEE
-	};
-
-	enum Endian {
-		E_Little,
-		E_Big
-	};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1,254 +0,0 @@
-/*
- * coding.h,	arm binary instruction coding
- *
- */
-#pragma once
-
-namespace ARM
-{
-	
-
-	/*
-	 *	Encoding Hi-Order 4bits, ConditionCode
-	 *
-	 */
-
-	enum ConditionCode
-	{
-		EQ = 0x00,	Equal		= EQ,	// 0000		Equal								Z set
-		NE = 0x01,	NotEqual	= NE,   // 0001		Not equal							Z clear
-		CS = 0x02,	CarrySet	= CS,   // 0010		Carry set/unsigned higher or same	C set
-		CC = 0x03,	CarryClr	= CC,   // 0011		Carry clear/unsigned lowe			C clear
-		MI = 0x04,	Minus		= MI,   // 0100		Minus/negative						N set
-		PL = 0x05,	Plus		= PL,   // 0101		Plus/positive or zero				N clear
-		VS = 0x06,	Overflow	= VS,   // 0110		Overflow							V set
-		VC = 0x07,	NoOverflow	= VC,   // 0111		No overflow							V clear
-
-		HI = 0x08,	UnHigher	= HI,   // 1000		Unsigned higher						C set and Z clear
-		LS = 0x09,	UnLower		= LS,   // 1001		Unsigned lower or same				C clear or Z set
-
-		GE = 0x0A,	GrOrEqual	= GE,   // 1010		Signed greater than or equal		N set and V set, or N clear and V clear (N == V)
-		LT = 0x0B,	Less		= LT,   // 1011		Signed less than					N set and V clear, or N clear and V set (N != V)
-		GT = 0x0C,	Greater		= GT,   // 1100		Signed greater than					Z clear, and either N set and V set, or N clear and V clear (Z == 0,N == V)
-		LE = 0x0D,	LessOrEqual	= LE,   // 1101		Signed less than or equal			Z set, or N set and V clear, or N clear and V set (Z == 1 or N != V)
-
-		AL = 0x0E,	Always		= AL,   // 1110		Always (unconditional) -
-
-
-		UC = 0x0F, Unconditional= UC,	// 1111		Unconditional Special Instruction for ARMv5? and above
-
-#define _ARM_COMPAT
-#if defined(_ARM_COMPAT)
-		CC_EQ=EQ, CC_NE=NE, CC_CS=CS, CC_CC=CC, CC_MI=MI, CC_PL=PL, CC_VS=VS, CC_VC=VC,
-		CC_HI=HI, CC_LS=LS, CC_GE=GE, CC_LT=LT, CC_GT=GT, CC_LE=LE, CC_AL=AL, CC_UC=UC,
-
-		CC_HS=CS, CC_LO=CC,
-#endif
-
-		ConditionCode_Size
-	};
-
-	
-	
-	/*
-	 *	Data-processing OPCODE 4bits, DPOP
-	 *
-	 */
-
-	enum DPOP
-	{
-		DP_AND,	// 0000		Logical AND             				Rd := Rn AND shifter_operand
-		DP_EOR,	// 0001		Logical Exclusive OR    				Rd := Rn EOR shifter_operand
-		DP_SUB,	// 0010		Subtract                				Rd := Rn - shifter_operand
-		DP_RSB,	// 0011		Reverse Subtract        				Rd := shifter_operand - Rn
-		DP_ADD,	// 0100		Add                     				Rd := Rn + shifter_operand
-		DP_ADC,	// 0101		Add with Carry          				Rd := Rn + shifter_operand + Carry Flag
-		DP_SBC,	// 0110		Subtract with Carry     				Rd := Rn - shifter_operand - NOT(Carry Flag)
-		DP_RSC,	// 0111		Reverse Subtract with Carry				Rd := shifter_operand - Rn - NOT(Carry Flag)
-		DP_TST,	// 1000		Test Update flags after					Rn AND shifter_operand
-		DP_TEQ,	// 1001		Test Equivalence Update flags after		Rn EOR shifter_operand
-		DP_CMP,	// 1010		Compare Update flags after				Rn - shifter_operand
-		DP_CMN,	// 1011		Compare Negated Update flags after		Rn + shifter_operand
-		DP_ORR,	// 1100		Logical (inclusive) OR					Rd := Rn OR shifter_operand
-		DP_MOV,	// 1101		Move									Rd := shifter_operand (no first operand)
-		DP_BIC,	// 1110		Bit Clear               				Rd := Rn AND NOT(shifter_operand)
-		DP_MVN	// 1111		Move Not                				Rd := NOT shifter_operand (no first operand)
-	};
-
-
-
-	enum ShiftOp {
-		S_LSL,
-		S_LSR,
-		S_ASR,
-		S_ROR,
-		S_RRX=S_ROR
-	};
-
-	
-	/*
-	 *	eReg:		ARM Register ID
-	 *
-	 */
-	enum eReg
-	{
-		r0=0,r1,  r2,  r3,
-		r4,  r5,  r6,  r7,
-		r8,  r9,  r10, r11,
-		r12, r13, r14, r15,
-
-		R0=0,R1,  R2,  R3,
-		R4,  R5,  R6,  R7,
-		R8,  R9,  R10, R11,
-		R12, R13, R14, R15,
-
-		// Aliases
-
-		a1 = r0,    a2 = r1,    a3 = r2,    a4 = r3,
-		A1 = R0,    A2 = R1,    A3 = R2,    A4 = R3,
-
-		v1 = r4,    v2 = r5,    v3 = r6,    v4 = r7,	v5 = r8,    v6 = r9,
-		V1 = R4,    V2 = R5,    V3 = R6,    V4 = R7,	V5 = R8,    V6 = R9,
-		
-		rfp = r9,	sl = r10,	fp = r11,	ip = r12,	sp = r13,	lr = r14,	pc = r15,
-		RFP = R9,	SL = R10,	FP = R11,	IP = R12,	SP = R13,	LR = R14,	PC = R15,
-	};
-
-
-	
-	/*
-	 *	eFQReg:		Float [Quad] Register ID		(A.SIMD)
-	 *
-	 */
-	enum eFQReg
-	{
-		q0=0,q1,  q2,  q3,
-		q4,  q5,  q6,  q7,
-		q8,  q9,  q10, q11,
-		q12, q13, q14, q15,
-
-		Q0=0,Q1,  Q2,  Q3,
-		Q4,  Q5,  Q6,  Q7,
-		Q8,  Q9,  Q10, Q11,
-		Q12, Q13, Q14, Q15
-	};
-	
-
-	/*
-	 *	eFDReg:		Float [Double] Register ID		(VFP / A.SIMD)
-	 *
-	 */
-	enum eFDReg
-	{
-		d0=0,d1,  d2,  d3,
-		d4,  d5,  d6,  d7,
-		d8,  d9,  d10, d11,
-		d12, d13, d14, d15,
-		d16, d17, d18, d19,
-		d20, d21, d22, d23,
-		d24, d25, d26, d27,
-		d28, d29, d30, d31,
-
-		D0=0,D1,  D2,  D3,
-		D4,  D5,  D6,  D7,
-		D8,  D9,  D10, D11,
-		D12, D13, D14, D15,
-		D16, D17, D18, D19,
-		D20, D21, D22, D23,
-		D24, D25, D26, D27,
-		D28, D29, D30, D31
-	};
-
-
-	/*
-	 *	eFSReg:		Float [Single] Register ID	(VFP)
-	 *
-	 *		Note:  Using [f,F]regN syntax to avoid clash with s{8,16,32} types.
-	 */
-	enum eFSReg
-	{
-		f0=0,f1,  f2,  f3,
-		f4,  f5,  f6,  f7,
-		f8,  f9,  f10, f11,
-		f12, f13, f14, f15,
-		f16, f17, f18, f19,
-		f20, f21, f22, f23,
-		f24, f25, f26, f27,
-		f28, f29, f30, f31,
-
-		F0=0,F1,  F2,  F3,
-		F4,  F5,  F6,  F7,
-		F8,  F9,  F10, F11,
-		F12, F13, F14, F15,
-		F16, F17, F18, F19,
-		F20, F21, F22, F23,
-		F24, F25, F26, F27,
-		F28, F29, F30, F31
-	};
-
-
-
-	enum eFSpecialReg
-	{
-
-		// VM**
-
-		FPINST = 9,
-		FPINST2=10,
-
-		FP_R_ERROR=0xFF
-	};
-
-
-	enum ePushPopReg
-	{
-		_r0 =0x0001,    _r1 =0x0002,    _r2 =0x0004,    _r3 =0x0008,
-		_r4 =0x0010,    _r5 =0x0020,    _r6 =0x0040,    _r7 =0x0080,
-		_r8 =0x0100,    _r9 =0x0200,    _r10=0x0400,    _r11=0x0800,
-		_r12=0x1000,    _r13=0x2000,    _r14=0x4000,    _r15=0x8000,
-
-		_a1  = _r0,    _a2  = _r1,    _a3  = _r2,    _a4  = _r3,
-		_v1  = _r4,    _v2  = _r5,    _v3  = _r6,    _v4  = _r7,
-		_v5  = _r8,    _v6  = _r9,    _rfp = _r9,    _sl  = _r10,
-		_fp  = _r11,   _ip  = _r12,   _sp  = _r13,   _lr  = _r14,
-		_pc  = _r15,
-
-		_push_all   = 0xFFFF,       // Save All 15
-		_push_call  = _lr|_rfp,     // Save lr && _rfb(cycle count)
-
-		_push_eabi  = _lr|_v1|_v2|_v3|_v4|_v5|_v6|_sl|_fp|_ip,  // this is guesswork ..
-	};
-	
-
-
-	/// WIP ///
-
-	struct FPReg
-	{
-		union
-		{
-			u8  vQ8[16];
-			u8  vD8[8];
-			u8  vS8[4];
-
-			u16 vQ16[8];	// *VFP: If half-word extensions are enabled 
-			u16 vD16[4];	// *VFP: If half-word extensions are enabled 
-			u16 vS16[2];	// *VFP: If half-word extensions are enabled 
-
-			u32 vQ32[4];
-			u32 vD32[2];
-			u32 S;
-
-		//	u64 vQ64[2];
-		//	u64 D;
-		};
-
-	};
-
-
-
-
-
-
-
-};
@@ -1,242 +0,0 @@
-/*
- *	disasm.h,	a horribly static yet (hopefully) correct disassembler
- *
- */
-#pragma once
-
-namespace ARM
-{
-	
-	
-	
-	inline static void armdis_cc(u32 cond, char *ccbuff)	// Length is always 8 for our static'{n,m}ess
-	{
-		switch(cond)
-		{	
-		case EQ:	sprintf(ccbuff, "EQ");	return;
-		case NE:	sprintf(ccbuff, "NE");	return;
-		case CS:	sprintf(ccbuff, "CS");	return;
-		case CC:	sprintf(ccbuff, "CC");	return;
-		case MI:	sprintf(ccbuff, "MI");	return;
-		case PL:	sprintf(ccbuff, "PL");	return;
-		case VS:	sprintf(ccbuff, "VS");	return;
-		case VC:	sprintf(ccbuff, "VC");	return;
-
-		case HI:	sprintf(ccbuff, "HI");	return;
-		case LS:	sprintf(ccbuff, "LS");	return;
-
-		case GE:	sprintf(ccbuff, "GE");	return;
-		case LT:	sprintf(ccbuff, "LT");	return;
-		case GT:	sprintf(ccbuff, "GT");	return;
-		case LE:	sprintf(ccbuff, "LE");	return;
-
-		case AL:	return;		// sprintf(ccbuff, "AL");	-- ALways doesn't need to be specified
-
-		case UC:				// 
-		default:	return;		// DIE
-		}
-	}
-
-
-	inline static void armdis_dp(u32 dpop, char *dpbuff)		// Length is always 8 ...
-	{
-		switch(dpop)
-		{
-		case DP_AND:	sprintf(dpbuff, "AND");	return;
-		case DP_EOR:	sprintf(dpbuff, "EOR");	return;
-		case DP_SUB:	sprintf(dpbuff, "SUB");	return;
-		case DP_RSB:	sprintf(dpbuff, "RSB");	return;
-		case DP_ADD:	sprintf(dpbuff, "ADD");	return;
-		case DP_ADC:	sprintf(dpbuff, "ADC");	return;
-		case DP_SBC:	sprintf(dpbuff, "SBC");	return;
-		case DP_RSC:	sprintf(dpbuff, "RSC");	return;
-		case DP_TST:	sprintf(dpbuff, "TST");	return;
-		case DP_TEQ:	sprintf(dpbuff, "TEQ");	return;
-		case DP_CMP:	sprintf(dpbuff, "CMP");	return;
-		case DP_CMN:	sprintf(dpbuff, "CMN");	return;
-		case DP_ORR:	sprintf(dpbuff, "ORR");	return;
-		case DP_MOV:	sprintf(dpbuff, "MOV");	return;
-		case DP_BIC:	sprintf(dpbuff, "BIC");	return;
-		case DP_MVN:	sprintf(dpbuff, "MVN");	return;
-		}
-	}
-
-
-
-	inline static void armdis(u32 op, char *disbuf, u32 len=512)
-	{
-		char ipref[8]={0}, isuff[8]={0}, icond[8]={0} ;
-
-
-		//	u32 uOP = ((op>>12)&0xFF00) | ((op>>4)&255) ;
-
-		u32 uCC = ((op>>28) & 0x0F) ;		// 
-
-		u32 uO1 = ((op>>25) & 0x07) ;		// 
-		u32 uO2 = ((op>> 4) & 0x01) ;		// 
-		u32 uC1 = ((op>>21) & 0x0F) ;		// 
-		u32 uC2 = ((op>> 5) & 0x07) ;		// 
-		u32 uSB = ((op>>20) & 0x01) ;		// Sign Change Bit
-
-
-		/*
-		if (uCC == UC) {
-
-			printf ("DBG armdis has UC instruction %X\n", op);
-			sprintf (disbuf, "UNCONDITIONAL / UNHANDLED INSTRUCTION");
-			return;
-
-		}
-
-
-		if (uCC != AL) {
-			armdis_cc(uCC,isuff);
-		}
-
-
-		if (uO1 == 0) 
-		{
-
-			if (uO2 == 0) {
-
-				if ((uC1 & 0xC) == 8) {
-					printf ("DBG armdis 0:0 10xx misc instruction \n", uCC);
-					sprintf (disbuf, "UNHANDLED INSTRUCTION 0:");
-					return;
-				}
-
-				// DP imm.shift			
-
-
-
-			}
-
-			else if (uO2 == 1) {
-
-				sprintf (disbuf, "UNHANDLED INSTRUCTION 0:");
-			}
-
-		}
-		else if (uO1 == 1) {
-
-			sprintf (disbuf, "UNHANDLED INSTRUCTION 1:");
-		}
-		else if (uO1 == 2) {
-
-			sprintf (disbuf, "UNHANDLED INSTRUCTION 2:");
-		}
-		else if (uO1 == 3) {
-
-			sprintf (disbuf, "UNHANDLED INSTRUCTION 3:");
-		}
-		else if (uO1 == 4) {
-
-			sprintf (disbuf, "UNHANDLED INSTRUCTION 4:");
-		}
-		else if (uO1 == 5) {
-
-			sprintf (disbuf, "UNHANDLED INSTRUCTION 5:");
-		}
-		else if (uO1 == 6) {
-
-			sprintf (disbuf, "UNHANDLED INSTRUCTION 6:");
-		}
-		else if (uO1 == 7) {
-
-			sprintf (disbuf, "UNHANDLED INSTRUCTION 7:");
-		}
-		else if (uO1 == 8) {
-
-			sprintf (disbuf, "UNHANDLED INSTRUCTION 8:");
-		}
-		else if (uO1 == 9) {
-
-			sprintf (disbuf, "UNHANDLED INSTRUCTION 9:");
-		}
-		else if (uO1 == 10) {
-
-			sprintf (disbuf, "UNHANDLED INSTRUCTION 10:");
-		}
-		else if (uO1 == 11) {
-
-			sprintf (disbuf, "UNHANDLED INSTRUCTION 11:");
-		}
-		else if (uO1 == 12) {
-
-			sprintf (disbuf, "UNHANDLED INSTRUCTION 12:");
-		}
-		else if (uO1 == 13) {
-
-			sprintf (disbuf, "UNHANDLED INSTRUCTION 13:");
-		}
-		else if (uO1 == 14) {
-
-			sprintf (disbuf, "UNHANDLED INSTRUCTION 14:");
-		}
-		else if (uO1 == 15)	{
-
-			sprintf (disbuf, "UNHANDLED INSTRUCTION 15:");
-		}
-		else {
-
-			sprintf (disbuf, "INVALID INSTRUCTION");
-		}
-		*/
-		if (!uC1 && uO1==5) {
-		 //B
-			char tmp[20];
-			tmp[0]='\0';
-			armdis_cc(uCC, tmp);
-			sprintf(disbuf, "B%s %08X", tmp, (op&0xffffff)<<2);
-		} else {
-			armdis_dp(uC1, disbuf);
-			char tmp[20];
-			tmp[0]='\0';
-			armdis_cc(uCC, tmp);
-			if (tmp[0]) {
-				strcat(disbuf, ".\0");
-				strcat(disbuf, tmp);
-			}
-			if (uSB) strcat(disbuf, ".S\0");
-			bool shifter=false;
-			switch (uO1) {
-				case 0:
-					// reg_reg
-					sprintf(tmp,"\tr%d, r%d", (op>>12)&0x0f, (op)&0x0f);
-					shifter=true;
-					break;
-				case 1:
-					// reg_imm
-					sprintf(tmp,"\tr%d, %04X", (op>>16)&0x0f, (op)&0xffff);
-					break;
-				default:
-					shifter=true;
-					sprintf(tmp, " 0x%0X", uO1);
-			}
-			strcat(disbuf, tmp);
-			char* ShiftOpStr[]={"LSL","LSR","ASR","ROR"};
-			u32 shiftop=(op>>5)&0x3;
-			u32 shiftoptype=(op>>4)&0x1;
-			u32 shiftopreg=(op>>8)&0xf;
-			u32 shiftopimm=(op>>7)&0x1f;
-			if (shifter) {
-				if (!shiftop && !shiftoptype && !shiftopimm)
-				{
-					//nothing
-				} else {
-					if ((shiftop==1) || (shiftop==2)) if (!shiftoptype) if (!shiftopimm) shiftopimm=32;
-					sprintf(tmp, " ,%s %s%d", ShiftOpStr[shiftop], (shiftoptype)?" r":" #", (shiftoptype)?shiftopreg:shiftopimm);
-					strcat(disbuf, tmp);
-				}
-			}
-		}
-	}
-
-
-
-
-
-
-
-};
-
@@ -1,128 +0,0 @@
-/*
- *	Emitter.h
- *
- *		ARMv7 ISA Emitter for code generation.
- *
- *		David Miller, 2011.
- */
-#pragma once
-
-
-#include "arm_coding.h"
-#include "arm_registers.h"
-//#include "arm_disasm.h"
-
-
-namespace ARM
-{
-
-	/*
-	 *	Emitter		- Reserved for use w/ static members ..
-	 *
-	 *
-	 */
-
-	class Emitter
-	{
-
-	};
-
-
-
-
-
-
-#if defined(_DEBUG) || defined(DEBUG)
-
-	#define EAPI void
-	
-	#define DECL_I				\
-	    u32 Instruction=0
-
-	#define DECL_Id(d)			\
-	    u32 Instruction=(d)
-
-#else
-	
-//	#define _inlineExSVoidA __extension__ static __inline void __attribute__ ((__always_inline__))
-
-	#define EAPI				\
-	    inline static void
-
-	#define DECL_I				\
-	    static u32 Instruction; \
-	        Instruction=0
-
-	#define DECL_Id(d)			\
-	    static u32 Instruction; \
-	        Instruction=(d)
-
-#endif
-
-
-	/*
-	 *	TEMP
-	 */
-	
-	
-#define I			(Instruction)
-
-#define SET_CC		I |= (((u32)CC&15)<<28)
-
-#ifndef EMIT_I
-#define EMIT_I		emit_Write32((I));
-#endif
-
-#ifndef EMIT_GET_PTR
-#define EMIT_GET_PTR()	emit_GetCCPtr()
-#endif
-
-};
-
-
-
-
-
-
-/*
- *	ARM Core Instructions
- */
-
-#include "E_Branches.h"
-#include "E_DataOp.h"
-#include "E_Multiply.h"
-#include "E_Parallel.h"
-#include "E_Extend.h"
-#include "E_Misc.h"
-#include "E_Status.h"
-#include "E_LoadStore.h"
-#include "E_Special.h"
-
-
-/*
- *	ARM VFP/A.SIMD Extension Instructions
- */
-
-#include "E_VLoadStore.h"
-#include "E_VRegXfer.h"
-#include "E_VDataOp.h"
-
-
-/*
- *	Helper Routines & Psuedo-Instructions
- */
-
-#include "H_psuedo.h"
-
-#include "H_Branches.h"
-#include "H_LoadStore.h"
-
-//#include "H_state.h"
-//#include "H_fp.h"
-
-
-
-
-
-
-
@@ -1,487 +0,0 @@
-/*
- *	registers.h
- *
- *		ARMv7-A system register(s).
- */
-#pragma once
-
-namespace ARM
-{
-
-/*************************************************************************************************
- *	CP15 Registers for VMSA Implementation.	[ref.DDI0406B B3.12]
- *************************************************************************************************/
-	/*
-		<CRn>	<opc1>	<CRm>		<opc2>			[NAME,]	Description											[Flags]
-		c0	{
-				0		c0	{
-									0				MIDR,	Main ID												RO
-									1				CTR,	Cache Type											RO
-									2				TCMTR,	TCM Type											RO, IMPL.DEFINED
-									3				TLBTR,	TLB Type											RO, IMPL.DEFINED
-									5				MPIDR,	Multiprocessor Affinity								RO
-									{4,6,7}			MIDR$,	Main ID Aliases										RO
-							}
-
-				0		c[1-7]		[0-7]			CPUID	ID_{PFRn,DFRn,AFR0,MMFRn,ISARn}						RO
-
-				1		c0			0				CCSIDR,	Cache Size ID										RO
-				1		c0			1				CLIDR,	Cache Level ID										RO
-				1		c0			7				AIDR,	Aux ID												RO,	IMPL.DEFINED
-
-				2		c0			0				CSSELR,	Cache Size Selection								RW
-		}
-
-		c1		0		c0			[0-2]			System Control												RW
-		c1		0		c1			[0-2]			Security Extension											RW, IMPL.OPTIONAL
-
-		c2		0		c0			[0-2]			Translation Table Base										RW
-
-		c3		0		c0			0				DACR, Domain Access Control									RW
-
-		c5		0		c{0,1}		{0,1}			Fault Status												RW
-
-		c6		0		c0			{0,2]			Fault Address												RW
-
-		c7		0	{
-						c0			4				NOP															WO
-						c1			{0,6}			Cache Maintenance operations, Multiprocessing Extensions	WO
-						c4			0				PAR, Physical Address										RW
-						c5			{0,1,6,7}		Cache and branch predictor maintenance operations			WO
-						c5			4				CP15ISB, Instruction barrier operation						WO, USER
-						c6			{1,2}			Cache Maintenance operations								WO
-						c8			[0-7]			VA to PA translation ops.									WO
-						c10			{1,2}			Cache management ops.										WO
-						c10			{4,5}			Data barrier ops.											WO, USER
-						c11			1				DCCMVAU, Cache barrier ops.									WO
-						c13			1				NOP															WO
-						c14			{1,2}			Cache management ops.										WO
-					}
-
-		c8		0		c{3,5,6,7}	[0-3]			TLB maintenance ops. *										WO
-		
-		c9		[0-7]	c{0,2,5,8}	[0-7]			Reserved for Branch Predictor, Cache and TCM ops.			RSVD, OP.ACCESS
-		c9		[0-7]	c[12-15]	[0-7]			Reserved for Performance monitors.							RSVD, OP.ACCESS
-
-		c10		0		c{0,1,4,8}	[0-7]			Reserved for TLB lockdown ops.								RSVD, OP.ACCESS
-		c10		0		c2			{0,1}			PRRR, NMRRR,	TEX Remap									RW
-		
-		c11		[0-7]	c{0,8,15}	[0-7]			Reserved for DMA ops. TCM access.							RSVD, OP.ACCESS
-
-		c12		0		c0			{0,1}			Security Extensions											RW, IMPL.OPTIONAL
-		c12		0		c1			0				ISR, Security Extensions									RO, IMPL.OPTIONAL
-
-		c13		0		c0			0				FCSEIDR, FCSE PID											RO-if-FCSE-!IMPL / RW?
-		c13		0		c0			[1-4]			Software Thread and Context ID								RW
-
-		c15		*		*			*				IMPLEMENTATION DEFINED										IMPL.DEFINED
-	*/
-
-
-	
-/*************************************************************************************************
- *	CP15 c0:  ID codes registers
- *************************************************************************************************/
-
-
-	/*
-	 *	MIDR: Main ID Register
-	 */
-	struct MIDR
-	{
-		u32 Revision		: 4;
-		u32 PriPartNum		: 12;	// IF Impl:ARM && PriPartNo top 4bits are 0 || 7: arch&variant encoding differs
-		u32 Architecture	: 4;
-		u32 Variant			: 4;
-		u32 Implementer		: 8;
-	};
-
-	enum MIDR_Implementer
-	{
-		ARM_Ltd						= 0x41,		// 'A'
-		DigitalEquipment_Corp		= 0x44,		// 'D'
-		Motorola_FreescaleSemi_Inc	= 0x4D,		// 'M'
-		QUALCOMM_Inc				= 0x51,		// 'Q'
-		MarvellSemi_Inc				= 0x56,		// 'V'
-		Intel_Corp					= 0x69,		// 'i'
-
-		TexasInstruments_Inc		= 0xFF		// 'T' ???
-	};
-
-	enum MIDR_Arch
-	{
-		ARMv4		= 1,
-		ARMv4T		= 2,
-		ARMv5		= 3,	// obselete
-		ARMv5T		= 4,
-		ARMv5TE		= 5,
-		ARMv5TEJ	= 6,
-		ARMv6		= 7,
-		CPUID_Defined = 15
-	};
-
-
-
-
-	/*
-	 *	CTR, Cache Type Register
-	 */
-	struct CTR
-	{
-		u32 IminLine	: 4;
-		u32 SBZ			: 10;
-		u32 L1Ip		: 2;
-		u32 DminLine	: 4;	// 
-		u32 ERG			: 4;	// Exclusives Reservation Granule.
-		u32 CWG			: 4;	// Cache Writeback Granule.
-		u32 RAZ			: 1;
-		u32 REGFMT		: 3;	// Set to 0b100 for ARMv7 register format, or 0b000 for <=ARMv6 format
-	};
-
-
-
-	
-	/*
-	 *	TCMTR, TCM Type Register
-	 */
-	// High 3 bits is 0b100, the rest is IMPL.DEFINED
-	typedef u32 TCMTR;
-
-
-	/*
-	 *	TLBTR, TLB Type Register
-	 */
-	// Low bit is nU : SET:1: Not unified ( separate instruction and data TLBs )
-	typedef u32 TLBTR;
-
-
-	/*
-	 *	MPIDR, Multiprocessor Affinity Register
-	 */
-
-	struct MPIDR
-	{
-		u32 AffinityLevel0	: 8;
-		u32 AffinityLevel1	: 8;
-		u32 AffinityLevel2	: 8;
-		u32 MT				: 1;
-		u32 RAZ				: 5;	// Reserved As Zero
-		u32 U				: 1;	// Set: Processor is part of a Uniprocessor system.
-		u32 MP_Impl			: 1;	// RAO if MP Extensions are implemented.
-	};
-
-
-	/*
-	 *	CCSIDR, Cache Size ID Registers
-	 */
-	struct CCSIDR
-	{
-		u32 LineSize		: 3;
-		u32 Associativity	: 10;
-		u32 NumSets			: 15;
-		u32 WA				: 1;
-		u32 RA				: 1;
-		u32 WB				: 1;
-		u32 WT				: 1;
-	};
-
-
-	
-	/*
-	 *	CLIDR, Cache Level ID Register
-	 */
-	struct CLIDR
-	{
-		u32 Ctype1	: 3;
-		u32 Ctype2	: 3;
-		u32 Ctype3	: 3;
-		u32 Ctype4	: 3;
-		u32 Ctype5	: 3;
-		u32 Ctype6	: 3;
-		u32 Ctype7	: 3;
-		u32 LoUIS	: 3;
-		u32 LoC		: 3;
-		u32 LoUU	: 3;
-		u32 RAZ		: 2;	// RAZ
-	};
-
-
-	/*
-	 *	AIDR, Auxiliary ID Register.
-	 */
-	typedef u32 AIDR;	// IMPLEMENTATION DEFINED
-
-
-
-	/*
-	 *	CSSELR, Cache Size Selection Register
-	 */
-	struct CSSELR
-	{
-		u32 InD		: 1;
-		u32 Level	: 3;
-		u32 SBZP	: 28;
-	};
-
-
-
-
-
-
-
-
-
-
-	
-/*************************************************************************************************
- *	CP15 c1:  System control registers
- *************************************************************************************************/
-
-
-
-
-	// SCTRL, ACTLR	//////////////////////  TODO  ///////////////////////
-
-
-
-
-	/*
-	 *	CPACR: Coprocessor Access Control Register.
-	 *
-	 *		Controls access to all coprocessors other than CP14 & CP15.
-	 *		It may be used to check for their presence by testing modification to cpN bits.
-	 *
-	 *	Notes:
-	 *
-	 *		D32DIS:1 && ASEDIS:0 is INVALID
-	 *		ASEDIS on hw { w. VFP & w.o A.SIMD } is RAO/WI, if bit is not supported it is RAZ/WI.
-	 *		
-	 *		When Security Extensions are enabled, NSACR controls CP access from non-secure state.
-	 *
-	 *		VFP uses CP10 && CP11, the values of .cp10 && .cp11 should be the same.
-	 */
-	union CPACR
-	{
-		struct {
-			u32 cp0  : 2;	// cpN [0-13]:
-			u32 cp1  : 2;	//	Defines access rights for individual coprocessors.
-			u32 cp2  : 2;	//	See CP_Access enum below for possible values;
-			u32 cp3  : 2;	//
-			u32 cp4  : 2;	//	To test
-			u32 cp5  : 2;
-			u32 cp6  : 2;
-			u32 cp7  : 2;
-			u32 cp8  : 2;
-			u32 cp9  : 2;
-			u32 cp10 : 2;
-			u32 cp11 : 2;
-			u32 cp12 : 2;
-			u32 cp13 : 2;
-			u32 rsvcd: 2;	// SBZP
-			u32 D32DIS:1;	// SET: Disables use of D16-D32 of the VFP register file.
-			u32 ASEDIS:1;	// SET: Disables all A.SIMD Instructions, VFPv3 shall remain valid.
-		};
-
-		u32 R;
-	};
-
-	/*
-	 *	CP_Access:	Enumerates access rights for CPACR.cpN
-	 *
-	 */
-	enum CP_Access
-	{
-		A_Deny,			// Deny Access,			Attempts to access cause Exception::Undefined_Instruction
-		A_Privileged,	// Privileged Access,	Attempts to access cause Exception::Undefined_Instruction in User mode.
-		A_Reserved,		// Reserved Value,		Use of this value is UNPREDICTABLE.
-		A_Full			// Full Access,			Access is defined by coprocessor.
-	};
-
-
-
-
-
-
-	/*
-	 *	SCR:	Secure Configuration Register.
-	 *
-	 *		Requires:	Security Extension.
-	 */
-	union SCR
-	{
-		struct {
-			u32 NS	: 1;	// 
-			u32 IRQ	: 1;	// 
-			u32 FIQ	: 1;	// 
-			u32 EA	: 1;	// 
-			u32 FW	: 1;	// 
-			u32 AW	: 1;	// 
-			u32 nET	: 1;	// 
-			u32 SBZP:25;
-		};
-
-		u32 R;
-	};
-
-
-
-
-	// SDER, Secure Debug Enable Register
-
-	// NSACR, Non-Secure Access Control Register
-
-
-
-	
-
-
-
-
-
-
-
-	
-/*************************************************************************************************
- *	CP15 c{2,3}:  Memory protection and control registers
- *************************************************************************************************/
-
-
-	// TTBR0 TTVR1 TTVCR
-	// DACR, Domain Access Control Register
-
-	
-	
-/*************************************************************************************************
- *	CP15 c4:  Not used
- *************************************************************************************************/
-
-	
-	
-/*************************************************************************************************
- *	CP15 c{5,6}:  Memory system fault registers
- *************************************************************************************************/
-
-	// DFSR,  Data Fault Status Register
-	// IFSR,  Instruction Fault Status Register
-	// ADFSR, Aux. DFSR
-	// AIFSR, Aux. IFSR
-	// DFAR,  Data Fault Address Register
-	// IFAR,  Instruction Fault Address Register
-
-
-	
-	
-/*************************************************************************************************
- *	CP15 c7:  Cache maintenance / misc
- *************************************************************************************************/
-
-
-
-
-	
-	
-/*************************************************************************************************
- *************************************************************************************************
- *	A.SIMD and VFP extension system registers
- *************************************************************************************************
- *************************************************************************************************/
-
-	enum FP_SysRegs
-	{
-		R_FPSID		= 0,	// 0b0000
-		R_MVFR1		= 6,	// 0b0110
-		R_MVFR0		= 7,	// 0b0111
-	};
-
-	
-	//	FPSID	Floating Point System ID Register
-	//	MVFR1	Media and VFP Feature Register 1
-	//	MVFR0	Media and VFP Feature Register 0
-
-	struct FPSID
-	{
-		u32 Revision	: 4;	// IMPL.DEFINED
-		u32 Variant		: 4;	// IMPL.DEFINED
-		u32 PartNumber	: 8;	// IMPL.DEFINED
-		u32 SubArch		: 7;	// MSB:1 when designed by ARM
-		u32 SW			: 1;	// Is a software impl. if set
-		u32 Implementer	: 8;	// Same as MIDR.Implementer
-	};
-
-	enum FP_SubArch
-	{
-		VFPv1	= 0,	// Not Permitted in ARMv7
-		VFPv2_Cv1,		// Not Permitted in ARMv7
-		VFPv3_Cv2,		// 
-		VFPv3_Null,		// Full hardware, no trap
-		VFPv3_Cv3,		// 
-	};
-
-
-
-	//	Floating-point status and control register
-	//
-	struct FPSCR
-	{
-		u32 IOC		: 1;	// * All * bits are cumulative exception bits
-		u32 DZC		: 1;	// *
-		u32 OFC		: 1;	// *
-		u32 UFC		: 1;	// *
-		u32 IXC		: 1;	// *
-		u32 SBZP1	: 2;	// 
-		u32 IDC		: 1;	// *
-		u32 IOE		: 1;	// ** All ** bits are FP trap enable bits
-		u32 DZE		: 1;	// ** only supported in VFPv2 && VFPv3U
-		u32 OFE		: 1;	// ** - RAZ elsewhere -
-		u32 UFE		: 1;	// **
-		u32 IXE		: 1;	// **
-		u32 SBZP2	: 2;	// 
-		u32 IDE		: 1;	// **
-		u32 Len		: 3;	// SBZ for ARMv7 VFP, ignored for A.SIMD
-		u32 SBZP3	: 1;	// 
-		u32 Stride	: 2;	// SBZ for ARMv7 VFP, ignored for A.SIMD
-		u32 RMode	: 2;	// Rounding Mode
-		u32 FZ		: 1;	// Flush-to-Zero
-		u32 DN		: 1;	// Default NaN mode control
-		u32 AHP		: 1;	// Alt. Half-precision
-		u32 QC		: 1;	// Cumulative saturation, A.SIMD
-		u32 V		: 1;	// CC Overflow
-		u32 C		: 1;	// CC Carry
-		u32 Z		: 1;	// CC Zero
-		u32 N		: 1;	// CC Negative
-	};
-
-	enum FP_RoundingMode	// A.SIMD Always uses RN !
-	{
-		RN,	// Round to Nearest
-		RP,	// Round towards Plus Infinity
-		RM,	// Round towards Minus Infinity
-		RZ	// Round towards Zero
-	};
-
-
-	struct MVFR0
-	{
-		u32 A_SIMD	: 4;
-		u32 Single	: 4;
-		u32 Double	: 4;
-		u32 Trap	: 4;
-		u32 Divide	: 4;
-		u32 Sqrt	: 4;
-		u32 ShortVec: 4;
-		u32 Rounding: 4;
-	};
-
-	struct MVFR1
-	{
-		u32 FtZ_mode	: 4;
-		u32 D_NaN_mode	: 4;
-		u32 NFP_LdStr	: 4;
-		u32 NFP_int		: 4;
-		u32 NFP_SPFP	: 4;
-		u32 NFP_HPFP	: 4;
-		u32 VFP_HPFP	: 4;
-		u32 RAZ			: 4;
-
-	};
-};
@@ -1,75 +1,241 @@
 /*
-	
+	reicast build options

-	nullDC-Beagle build configuration options
+		Reicast can support a lot of stuff, and this is an attempt
+		to organize the build time options

-	fine grained options
-	HOST_OS,HOST_CPU, ..
+		Option categories
+
+			BUILD_* - BUILD_COMPILER, etc...
+				definitions about the build machine
+
+			HOST_*	
+				definitions about the host machine
+
+			FEAT_*
+				definitions about the features that this build targets
+				This is higly related to HOST_*, but it's for options that might
+				or might not be avaiable depending on the target host, or that 
+				features that are irrelevant of	the host
+
+				Eg, Alsa, Pulse Audio and OSS might sense as HOST dedinitions
+				but it usually makes more sense to detect them as runtime. In
+				that context, HOST_ALSA makes no sense because the host might
+				or might not have alsa installed/ running
+
+				MMU makes no sense as a HOST definition at all, so it should
+				be FEAT_HAS_MMU
+
+			TARGET_*
+				A preconfigured default. Eg TARGET_WIN86. 
+
+		Naming of options, option values, and how to use them
+			
+			for options that makes sense to have a list of values
+				{CATEGORY}_{OPTION} 
+				{OPTION}_{VALUE}
+
+				eg.
+				BUILD_COMPILER == COMPILER_GCC, HOST_CPU != CPU_X64, ...
+
+			for options that are boolean
+				{CATEGORY}_IS_{OPTION} or {CATEGORY}_HAS_{OPTION} 
+				
+				Evaluates to 0 or 1
+
+			If an configuration cannot be neatly split into a set of
+			of orthogonal options, then it makes sense to break things
+			to "sets" or have a hierarchy of options. 
+
+			Example
+			-------
+			
+			In the beggining it made sense to have an audio backend
+			per operating system. It made sense to have it depend 
+			on HOST_OS and seleect DirectSound or alsa. 
+
+				// no option needed
+
+			Then, as android was introduced, which also uses OS_LINUX
+			atm, the audio could have been made an option. It could be
+			a HOST_* option, or FEAT_* one. I'd prefer FEAT_*. 
+			FEAT_* makes more sense as future wise we might want
+			to support multiple backends.
+				
+				FEAT_AUDIO_BACKEND
+					AUDIO_BACKEND_NONE
+					AUDIO_BACKEND_DS
+					AUDIO_BACKEND_ALSA
+					AUDIO_BACKEND_ANDROID
+
+				Used like
+					#if FEAT_AUDIO_BACKEND == AUDIO_BACKEND_DS ....
+			
+			At some point, we might have multiple audio backends that
+			can be compiled in and autodetected/selected at runtime.
+			In that case, it might make sense to have the options like
+
+					FEAT_HAS_ALSA
+					FEAT_HAS_DIRECTSOUND
+					FEAT_HAS_ANDROID_AUDIO
+
+				or 
+					FEAT_HAS_AUDIO_ALSA
+					FEAT_HAS_AUDIO_DS
+					FEAT_HAS_AUDIO_ANDROID
+
+				The none option might or might not make sense. In this
+				case it can be removed, as it should always be avaiable.
+
+			Guidelines
+			----------
+
+			General rule of thumb, don't overcomplicate things. Start
+			with a simple option, and then make it more complicated
+			as new uses apply (see the example above)
+
+			Don't use too long names, don't use too cryptic names. 
+			Most team developers should be able to understand or
+			figure out most of the acronyms used. 
+
+			Try to be consistent on the acronyms across all definitions
+
+			Code shouldn't depend on build level options whenever possible
+
+			Generally, the file should compile even if the option/module is
+			disabled. This makes makefiles etc much easier to write
+
+			TARGET_* options should generally only be used in this file
+
+			The current source is *not* good example of these guidelines
+
+		We'll try to be smart and figure out some options/defaults on this file
+		but this shouldn't get too complicated

-	build-level options
-	TARGET_BEAGLE, TARGET_WIN86, ...

-	code shouldn't depend on build level options whenever possible
 */

-//ndc configs
-
-#define NO_MMU
-//#define HOST_NO_REC
+//#define STRICT_MODE
+#ifndef STRICT_MODE
+#define FAST_MMU
+#define USE_WINCE_HACK
+#endif

 #define DC_PLATFORM_MASK        7
-#define DC_PLATFORM_NORMAL      0   /* Works, for the most part */
+#define DC_PLATFORM_DREAMCAST   0   /* Works, for the most part */
 #define DC_PLATFORM_DEV_UNIT    1   /* This is missing hardware */
 #define DC_PLATFORM_NAOMI       2   /* Works, for the most part */ 
 #define DC_PLATFORM_NAOMI2      3   /* Needs to be done, 2xsh4 + 2xpvr + custom TNL */
-#define DC_PLATFORM_ATOMISWAVE  4   /* Needs to be done, DC-like hardware with possibly more ram */
+#define DC_PLATFORM_ATOMISWAVE  4   /* Works, for the most part */
 #define DC_PLATFORM_HIKARU      5   /* Needs to be done, 2xsh4, 2x aica , custom vpu */
 #define DC_PLATFORM_AURORA      6   /* Needs to be done, Uses newer 300 mhz sh4 + 150 mhz pvr mbx SoC */
- 
-
-#define DC_PLATFORM DC_PLATFORM_NORMAL
-
-
-//Target platform configs
-//HOST_OS
-#define OS_WINDOWS   0x10000001
-#define OS_LINUX     0x10000002

 //HOST_CPU
 #define CPU_X86      0x20000001
 #define CPU_ARM      0x20000002
 #define CPU_MIPS     0x20000003
+#define CPU_X64      0x20000004
+#define CPU_GENERIC  0x20000005 //used for pnacl, emscripten, etc
+#define CPU_PPC      0x20000006
+#define CPU_PPC64    0x20000007
+#define CPU_ARM64    0x20000008
+#define CPU_MIPS64   0x20000009

-//BUILD_COMPILER
-#define COMPILER_VC  0x30000001
-#define COMPILER_GCC 0x30000002
+//FEAT_SHREC, FEAT_AREC, FEAT_DSPREC
+#define DYNAREC_NONE	0x40000001
+#define DYNAREC_JIT		0x40000002
+#define DYNAREC_CPP		0x40000003

-///
-#if (!defined(TARGET_WIN86) && !defined(TARGET_BEAGLE) && !defined(TARGET_NACL32) && !defined(TARGET_GCW0) && !defined(TARGET_PANDORA))
-	#define TARGET_WIN86
-#endif

-#ifdef TARGET_WIN86
-	#define HOST_OS OS_WINDOWS
+//automatic
+
+#if defined(__x86_64__) || defined(_M_X64)
+	#define HOST_CPU CPU_X64
+#elif defined(__i386__) || defined(_M_IX86)
 	#define HOST_CPU CPU_X86
-	#define BUILD_COMPILER COMPILER_VC
-#elif TARGET_PANDORA
-	#define HOST_OS OS_LINUX
+#elif defined(__arm__) || defined (_M_ARM)
 	#define HOST_CPU CPU_ARM
-	#define BUILD_COMPILER COMPILER_GCC
-#elif TARGET_BEAGLE
-	#define HOST_OS OS_LINUX
-	#define HOST_CPU CPU_ARM
-	#define BUILD_COMPILER COMPILER_GCC
-#elif TARGET_GCW0
-	#define HOST_OS OS_LINUX
+#elif defined(__aarch64__) || defined(_M_ARM64)
+	#define HOST_CPU CPU_ARM64
+#elif defined(__mips__)
 	#define HOST_CPU CPU_MIPS
-	#define BUILD_COMPILER COMPILER_GCC
-#elif TARGET_NACL32
-	#define HOST_OS OS_LINUX
-	#define HOST_CPU CPU_X86
-	#define BUILD_COMPILER COMPILER_GCC
 #else
-	#error Invalid Target: TARGET_* not defined
+	#define HOST_CPU CPU_GENERIC
 #endif

+#if defined(TARGET_NO_REC)
+#define FEAT_SHREC DYNAREC_NONE
+#define FEAT_AREC DYNAREC_NONE
+#define FEAT_DSPREC DYNAREC_NONE
+#endif
+
+#if defined(TARGET_NO_AREC)
+#define FEAT_SHREC DYNAREC_JIT
+#define FEAT_AREC DYNAREC_NONE
+#define FEAT_DSPREC DYNAREC_NONE
+#endif
+
+#if defined(TARGET_NO_JIT)
+#define FEAT_SHREC DYNAREC_CPP
+#define FEAT_AREC DYNAREC_NONE
+#define FEAT_DSPREC DYNAREC_NONE
+#endif
+
+#ifdef __SWITCH__
+#define FEAT_NO_RWX_PAGES
+#endif
+
+//defaults
+
+#ifndef FEAT_SHREC
+	#if HOST_CPU == CPU_ARM || HOST_CPU == CPU_ARM64 || HOST_CPU == CPU_X86 || HOST_CPU == CPU_X64
+		#define FEAT_SHREC DYNAREC_JIT
+	#else
+		#define FEAT_SHREC DYNAREC_NONE
+	#endif
+#endif
+
+#ifndef FEAT_AREC
+	#if HOST_CPU == CPU_ARM || HOST_CPU == CPU_ARM64 || HOST_CPU == CPU_X64
+		#define FEAT_AREC DYNAREC_JIT
+	#else
+		#define FEAT_AREC DYNAREC_NONE
+	#endif
+#endif
+
+#ifndef FEAT_DSPREC
+	#if HOST_CPU == CPU_ARM || HOST_CPU == CPU_ARM64 || HOST_CPU == CPU_X86 || HOST_CPU == CPU_X64
+		#define FEAT_DSPREC DYNAREC_JIT
+	#else
+		#define FEAT_DSPREC DYNAREC_NONE
+	#endif
+#endif
+
+// Some restrictions on FEAT_NO_RWX_PAGES
+#if defined(FEAT_NO_RWX_PAGES) && FEAT_SHREC == DYNAREC_JIT
+#if HOST_CPU != CPU_X64 && HOST_CPU != CPU_ARM64
+#error "FEAT_NO_RWX_PAGES Only implemented for X64 and ARMv8"
+#endif
+#endif
+
+
+// TARGET PLATFORM
+
+#define RAM_SIZE_MAX (32*1024*1024)
+#define VRAM_SIZE_MAX (16*1024*1024)
+#define ARAM_SIZE_MAX (8*1024*1024)
+
+#define GD_CLOCK 33868800				//GDROM XTAL -- 768fs
+
+#define AICA_CORE_CLOCK (GD_CLOCK*4/3)		//[45158400]  GD->PLL 3:4 -> AICA CORE	 -- 1024fs
+#define ADAC_CLOCK (AICA_CORE_CLOCK/4)		//[11289600]  44100*256, AICA CORE -> PLL 4:1 -> ADAC -- 256fs
+#define AICA_ARM_CLOCK (AICA_CORE_CLOCK/2)	//[22579200]  AICA CORE -> PLL 2:1 -> ARM
+#define AICA_SDRAM_CLOCK (GD_CLOCK*2)		//[67737600]  GD-> PLL 2 -> SDRAM
+#define SH4_MAIN_CLOCK (200*1000*1000)		//[200000000] XTal(13.5) -> PLL (33.3) -> PLL 1:6 (200)
+#define SH4_RAM_CLOCK (100*1000*1000)		//[100000000] XTal(13.5) -> PLL (33.3) -> PLL 1:3 (100)	, also suplied to HOLLY chip
+#define G2_BUS_CLOCK (25*1000*1000)			//[25000000]  from Holly, from SH4_RAM_CLOCK w/ 2 2:1 plls
+
+#if defined(GLES) && !defined(GLES3) && !defined(GLES2)
+// Only use GL ES 2.0 API functions
+#define GLES2
+#endif
@@ -1,435 +1,120 @@
-/*
-	Config file crap
-	Supports various things, as virtual config entries and such crap
-	Works surprisingly well considering how old it is ...
-*/
-
-#define _CRT_SECURE_NO_DEPRECATE (1)
 #include "cfg.h"
+#include "ini.h"
+#include "stdclass.h"

-string cfgPath;
+#include <cerrno>

-//A config remains virtual only as long as a write at it
-//doesn't override the virtual value.While a config is virtual, a copy of its 'real' value is held and preserved
+static std::string cfgPath;
+static bool save_config = true;
+static bool autoSave = true;

-//Is this a virtual entry ?
-#define CEM_VIRTUAL 1
-//Should the value be saved ?
-#define CEM_SAVE	2 
-//is this entry readonly ? 
-#define CEM_READONLY 4
-//the move is from loading ?
-#define CEM_LOAD 8
+static emucfg::ConfigFile cfgdb;

-struct ConfigEntry
+static void saveConfigFile()
 {
-	ConfigEntry(ConfigEntry* pp)
-	{
-		next=pp;
-		flags=0;
-	}
-
-
-	u32 flags;
-	string name;
-	string value;
-	string valueVirtual;
-	ConfigEntry* next;
-	void SaveFile(FILE* file)
-	{
-		if (flags & CEM_SAVE)
-			fprintf(file,"%s=%s\n",name.c_str(),value.c_str());
-	} 
-
-	string GetValue()
-	{
-		if (flags&CEM_VIRTUAL)
-			return valueVirtual;
-		else
-			return value;
-	}
-};
-struct ConfigSection
-{
-	u32 flags;
-	string name;
-	ConfigEntry* entrys;
-	ConfigSection* next;
-	
-	ConfigSection(ConfigSection* pp)
-	{
-		next=pp;
-		flags=0;
-		entrys=0;
-	}
-	ConfigEntry* FindEntry(string name)
-	{
-		ConfigEntry* c=	entrys;
-		while(c)
-		{
-			if (stricmp(name.c_str(),c->name.c_str())==0)
-				return c;
-			c=c->next;
-		}
-		return 0;
-	}
-	void SetEntry(string name,string value,u32 eflags)
-	{
-		ConfigEntry* c=FindEntry(name);
-		if (c)
-		{
-			//readonly is read only =)
-			if (c->flags & CEM_READONLY)
-				return;
-
-			//virtual : save only if different value
-			if (c->flags & CEM_VIRTUAL)
-			{
-
-				if(stricmp(c->valueVirtual.c_str(),value.c_str())==0)
-					return;
-				c->flags&=~CEM_VIRTUAL;
-			}
-		}
-		else
-		{
-			entrys=c= new ConfigEntry(entrys);
-			c->name=name;
-		}
-
-		verify(!(c->flags&(CEM_VIRTUAL|CEM_READONLY)));
-		//Virtual
-		//Virtual | ReadOnly
-		//Save
-		if (eflags & CEM_VIRTUAL)
-		{
-			verify(!(eflags & CEM_SAVE));
-			c->flags|=eflags;
-			c->valueVirtual=value;
-		}
-		else if (eflags & CEM_SAVE)
-		{
-			verify(!(eflags & (CEM_VIRTUAL|CEM_READONLY)));
-			flags|=CEM_SAVE;
-			c->flags|=CEM_SAVE;
-
-			c->value=value;
-		}
-		else
-		{
-			die("Invalid eflags value");
-		}
-		
-	}
-	~ConfigSection()
-	{
-		ConfigEntry* n=entrys;
-		
-		while(n)
-		{
-			ConfigEntry* p=n;	
-			n=n->next;
-			delete p;
-		}
-	}
-	void SaveFile(FILE* file)
-	{
-		if (flags&CEM_SAVE)
-		{
-			fprintf(file,"[%s]\n",name.c_str());
-
-			vector<ConfigEntry*> stuff;
-
-			ConfigEntry* n=entrys;
-
-			while(n)
-			{
-				stuff.push_back(n);
-				n=n->next;
-			}
-
-			for (int i=stuff.size()-1;i>=0;i--)
-			{
-				stuff[i]->SaveFile(file);
-			}
-
-			fprintf(file,"\n");
-		}
-	}
-
-};
-struct ConfigFile
-{
-	ConfigSection* entrys;
-	ConfigSection* FindSection(string name)
-	{
-		ConfigSection* c=	entrys;
-		while(c)
-		{
-			if (stricmp(name.c_str(),c->name.c_str())==0)
-				return c;
-			c=c->next;
-		}
-		return 0;
-	}
-	ConfigSection* GetEntry(string name)
-	{
-		ConfigSection* c=FindSection(name);
-		if (!c)
-		{
-			entrys=c= new ConfigSection(entrys);
-			c->name=name;
-		}
-
-		return c;
-	}
-	~ConfigFile()
-	{
-		ConfigSection* n=entrys;
-		
-		while(n)
-		{
-			ConfigSection* p=n;	
-			n=n->next;
-			delete p;
-		}
-	}
-
-	void ParseFile(FILE* file)
-	{
-		
-	}
-	void SaveFile(FILE* file)
-	{
-		vector<ConfigSection*> stuff;
-
-		ConfigSection* n=entrys;
-		
-		while(n)
-		{
-			stuff.push_back(n);
-			n=n->next;
-		}
-
-		for (int i=stuff.size()-1;i>=0;i--)
-		{
-			if (stuff[i]->name!="emu")
-				stuff[i]->SaveFile(file);
-		}
-	}
-};
-
-ConfigFile cfgdb;
-
-void savecfgf()
-{
-	FILE* cfgfile = fopen(cfgPath.c_str(),"wt");
+	FILE* cfgfile = nowide::fopen(cfgPath.c_str(), "wt");
 	if (!cfgfile)
-		printf("Error : Unable to open file for saving \n");
+	{
+		WARN_LOG(COMMON, "Error: Unable to open file '%s' for saving", cfgPath.c_str());
+	}
 	else
 	{
-		cfgdb.SaveFile(cfgfile);
-		fclose(cfgfile);
+		cfgdb.save(cfgfile);
+		std::fclose(cfgfile);
 	}
 }
-void  cfgSaveStr(const wchar * Section, const wchar * Key, const wchar * String)
+void cfgSaveStr(const std::string& section, const std::string& key, const std::string& value)
 {
-	cfgdb.GetEntry(Section)->SetEntry(Key,String,CEM_SAVE);
-	savecfgf();
-	//WritePrivateProfileString(Section,Key,String,cfgPath);
+	cfgdb.set(section, key, value);
+
+	if (save_config && autoSave)
+		saveConfigFile();
 }
-//New config code
-
-/*
-	I want config to be really flexible .. so , here is the new implementation :
-	
-	Functions :
-	cfgLoadInt  : Load an int , if it does not exist save the default value to it and return it
-	cfgSaveInt  : Save an int
-	cfgLoadStr  : Load a str , if it does not exist save the default value to it and return it
-	cfgSaveStr  : Save a str
-	cfgExists   : Returns true if the Section:Key exists. If Key is null , it retuns true if Section exists
-
-	Config parameters can be read from the config file , and can be given at the command line
-	-cfg section:key=value -> defines a value at command line
-	If a cfgSave* is made on a value defined by command line , then the command line value is replaced by it
-
-	cfg values set by command line are not written to the cfg file , unless a cfgSave* is used
-
-	There are some special values , all of em are on the emu namespace :)
-
-	These are readonly :
-
-	emu:AppPath		: Returns the path where the emulator is stored
-	emu:PluginPath	: Returns the path where the plugins are loaded from
-	emu:DataPath	: Returns the path where the bios/data files are
-
-	emu:FullName	: str,returns the emulator's name + version string (ex."nullDC v1.0.0 Private Beta 2 built on {datetime}")
-	emu:ShortName	: str,returns the emulator's name + version string , short form (ex."nullDC 1.0.0pb2")
-	emu:Name		: str,returns the emulator's name (ex."nullDC")
-
-	These are read/write
-	emu:Caption		: str , get/set the window caption
-*/
-
-///////////////////////////////
-/*
-**	This will verify there is a working file @ ./szIniFn
-**	- if not present, it will write defaults
-*/
-struct vitem
-{
-	string s;
-	string n;
-	string v;
-	vitem(string a,string b,string c){s=a;n=b;v=c;}
-};
-vector<vitem> vlist;
-wchar* trim_ws(wchar* str);

 bool cfgOpen()
 {
-	cfgPath=GetPath("/emu.cfg");
-	FILE* cfgfile = fopen(cfgPath.c_str(),"r");
-	if(!cfgfile) {
-		cfgfile = fopen(cfgPath.c_str(),"wt");
-		if(!cfgfile) 
-			printf("Unable to open the config file for reading or writing\nfile : %s\n",cfgPath.c_str());
-		else
-		{
-			fseek(cfgfile,0,SEEK_SET);
-			fclose(cfgfile);
-			cfgfile = fopen(cfgPath.c_str(),"r");
-			if(!cfgfile) 
-				printf("Unable to open the config file for reading\nfile : %s\n",cfgPath.c_str());
-		}
+	if (get_writable_config_path("").empty())
+		// Config dir not set (android onboarding)
+		return false;
+
+	const char* filename = "emu.cfg";
+	std::string config_path_read = get_readonly_config_path(filename);
+	cfgPath = get_writable_config_path(filename);
+
+	FILE* cfgfile = nowide::fopen(config_path_read.c_str(), "r");
+	if(cfgfile != NULL) {
+		cfgdb.parse(cfgfile);
+		std::fclose(cfgfile);
 	}
-
-	wchar line[512];
-	wchar cur_sect[512]={0};
-	int cline=0;
-	while(cfgfile && !feof(cfgfile))
+	else
 	{
-		fgets(line,512,cfgfile);
-		if (feof(cfgfile))
-			break;
-
-		cline++;
-
-		if (strlen(line)<3)
-			continue;
-		if (line[strlen(line)-1]=='\r' || line[strlen(line)-1]=='\n')
-			line[strlen(line)-1]=0;
-
-		wchar* tl=trim_ws(line);
-		if (tl[0]=='[' && tl[strlen(tl)-1]==']')
+		// Config file can't be opened
+		int error_code = errno;
+		WARN_LOG(COMMON, "Warning: Unable to open the config file '%s' for reading (%s)", config_path_read.c_str(), strerror(error_code));
+		if (error_code == ENOENT || cfgPath != config_path_read)
 		{
-			tl[strlen(tl)-1]=0;
-			strcpy(cur_sect,tl+1);
-			trim_ws(cur_sect);
+			// Config file didn't exist
+			INFO_LOG(COMMON, "Creating new empty config file at '%s'", cfgPath.c_str());
+			saveConfigFile();
 		}
 		else
 		{
-			if (cur_sect[0]==0)
-				continue;//no open section
-			wchar* str1=strstr(tl,"=");
-			if (!str1)
-			{
-				printf("Malformed entry on config - ignoring @ %d(%s)\n",cline,tl);
-				continue;
-			}
-			*str1=0;
-			str1++;
-			wchar* v=trim_ws(str1);
-			wchar* k=trim_ws(tl);
-			if (v && k)
-			{
-				ConfigSection*cs=cfgdb.GetEntry(cur_sect);
-				
-				//if (!cs->FindEntry(k))
-				cs->SetEntry(k,v,CEM_SAVE|CEM_LOAD);
-			}
-			else
-			{
-				printf("Malformed entry on config - ignoring @ %d(%s)\n",cline,tl);
-			}
+			// There was some other error (may be a permissions problem or something like that)
+			save_config = false;
 		}
 	}

-	for (size_t i=0;i<vlist.size();i++)
-	{
-		cfgdb.GetEntry(vlist[i].s)->SetEntry(vlist[i].n,vlist[i].v,CEM_VIRTUAL);
-	}
-	if (cfgfile)
-	{
-		cfgdb.SaveFile(cfgfile);
-		fclose(cfgfile);
-	}
 	return true;
 }

-//Implementations of the interface :)
-//Section must be set
-//If key is 0 , it looks for the section
-//0 : not found
-//1 : found section , key was 0
-//2 : found section & key
-s32  cfgExists(const wchar * Section, const wchar * Key)
+std::string cfgLoadStr(const std::string& section, const std::string& key, const std::string& def)
 {
-	if (Section==0)
-		return -1;
-	//return cfgRead(Section,Key,0);
-	ConfigSection*cs= cfgdb.FindSection(Section);
-	if (cs ==  0)
-		return 0;
-
-	if (Key==0)
-		return 1;
-
-	ConfigEntry* ce=cs->FindEntry(Key);
-	if (ce!=0)
-		return 2;
-	else
-		return 0;
-}
-void  cfgLoadStr(const wchar * Section, const wchar * Key, wchar * Return,const wchar* Default)
-{
-	verify(Section!=0 && strlen(Section)!=0);
-	verify(Key!=0 && strlen(Key)!=0);
-	verify(Return!=0);
-	if (Default==0)
-		Default="";
-	ConfigSection* cs= cfgdb.GetEntry(Section);
-	ConfigEntry* ce=cs->FindEntry(Key);
-	if (!ce)
-	{
-		cs->SetEntry(Key,Default,CEM_SAVE);
-		strcpy(Return,Default);
-	}
-	else
-	{
-		strcpy(Return,ce->GetValue().c_str());
-	}
+	return cfgdb.get(section, key, def);
 }

-//These are helpers , mainly :)
-s32  cfgLoadInt(const wchar * Section, const wchar * Key,s32 Default)
+void  cfgSaveInt(const std::string& section, const std::string& key, s32 value)
 {
-	wchar temp_d[30];
-	wchar temp_o[30];
-	sprintf(temp_d,"%d",Default);
-	cfgLoadStr(Section,Key,temp_o,temp_d);
-	return atoi(temp_o);
+	cfgSaveStr(section, key, std::to_string(value));
 }

-void  cfgSaveInt(const wchar * Section, const wchar * Key, s32 Int)
+s32 cfgLoadInt(const std::string& section, const std::string& key, s32 def)
 {
-	wchar tmp[32];
-	sprintf(tmp,"%d", Int);
-	cfgSaveStr(Section,Key,tmp);
+	return cfgdb.get_int(section, key, def);
 }
-void cfgSetVitual(const wchar * Section, const wchar * Key, const wchar * String)
+
+void  cfgSaveBool(const std::string& section, const std::string& key, bool value)
 {
-	vlist.push_back(vitem(Section,Key,String));
-	//cfgdb.GetEntry(Section,CEM_VIRTUAL)->SetEntry(Key,String,CEM_VIRTUAL);
-}
+	cfgSaveStr(section, key, value ? "yes" : "no");
+}
+
+bool  cfgLoadBool(const std::string& section, const std::string& key, bool def)
+{
+	return cfgdb.get_bool(section, key, def);
+}
+
+void cfgSetVirtual(const std::string& section, const std::string& key, const std::string& value)
+{
+	cfgdb.set(section, key, value, true);
+}
+
+bool cfgIsVirtual(const std::string& section, const std::string& key)
+{
+	return cfgdb.is_virtual(section, key);
+}
+
+bool cfgHasSection(const std::string& section)
+{
+	return cfgdb.has_section(section);
+}
+
+void cfgDeleteSection(const std::string& section)
+{
+	cfgdb.delete_section(section);
+}
+
+void cfgSetAutoSave(bool autoSave)
+{
+	::autoSave = autoSave;
+	if (autoSave)
+		saveConfigFile();
+}
@@ -2,19 +2,18 @@

 #include "types.h"

-/*
-**	cfg* prototypes, if you pass NULL to a cfgSave* it will wipe out the section
-**	} if you pass it to lpKey it will wipe out that particular entry
-**	} if you add write to something it will create it if its not present
-**	} ** Strings passed to LoadStr should be MAX_PATH in size ! **
-*/
-
 bool cfgOpen();
-s32   cfgLoadInt(const wchar * lpSection, const wchar * lpKey,s32 Default);
-void  cfgSaveInt(const wchar * lpSection, const wchar * lpKey, s32 Int);
-void  cfgLoadStr(const wchar * lpSection, const wchar * lpKey, wchar * lpReturn,const wchar* lpDefault);
-void  cfgSaveStr(const wchar * lpSection, const wchar * lpKey, const wchar * lpString);
-s32  cfgExists(const wchar * Section, const wchar * Key);
-void cfgSetVitual(const wchar * lpSection, const wchar * lpKey, const wchar * lpString);
+s32 cfgLoadInt(const std::string& section, const std::string& key, s32 def);
+void cfgSaveInt(const std::string& section, const std::string& key, s32 value);
+std::string cfgLoadStr(const std::string& section, const std::string& key, const std::string& def);
+void cfgSaveStr(const std::string& section, const std::string& key, const std::string& value);
+void cfgSaveBool(const std::string& section, const std::string& key, bool value);
+bool cfgLoadBool(const std::string& section, const std::string& key, bool def);
+void cfgSetVirtual(const std::string& section, const std::string& key, const std::string& value);
+bool cfgIsVirtual(const std::string& section, const std::string& key);

-bool ParseCommandLine(int argc,wchar* argv[]);
+bool ParseCommandLine(int argc, char *argv[]);
+
+void cfgSetAutoSave(bool autoSave);
+bool cfgHasSection(const std::string& section);
+void cfgDeleteSection(const std::string& section);
@@ -5,13 +5,13 @@
 	Nothing too interesting here, really
 */

-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cctype>
+#include <cstring>

 #include "cfg/cfg.h"

-wchar* trim_ws(wchar* str)
+char* trim_ws(char* str)
 {
 	if (str==0 || strlen(str)==0)
 		return 0;
@@ -42,47 +42,48 @@ wchar* trim_ws(wchar* str)
 	return str;
 }

-int setconfig(wchar** arg,int cl)
+int setconfig(char** arg,int cl)
 {
 	int rv=0;
 	for(;;)
 	{
 		if (cl<1)
 		{
-			printf("-config : invalid number of parameters, format is section:key=value\n");
+			WARN_LOG(COMMON, "-config : invalid number of parameters, format is section:key=value");
 			return rv;
 		}
-		wchar* sep=strstr(arg[1],":");
+		char* sep=strstr(arg[1],":");
 		if (sep==0)
 		{
-			printf("-config : invalid parameter %s, format is section:key=value\n",arg[1]);
+			WARN_LOG(COMMON, "-config : invalid parameter %s, format is section:key=value", arg[1]);
 			return rv;
 		}
-		wchar* value=strstr(sep+1,"=");
+		char* value=strstr(sep+1,"=");
 		if (value==0)
 		{
-			printf("-config : invalid parameter %s, format is section:key=value\n",arg[1]);
+			WARN_LOG(COMMON, "-config : invalid parameter %s, format is section:key=value", arg[1]);
 			return rv;
 		}

 		*sep++=0;
 		*value++=0;

-		wchar* sect=trim_ws(arg[1]);
-		wchar* key=trim_ws(sep);
+		char* sect=trim_ws(arg[1]);
+		char* key=trim_ws(sep);
 		value=trim_ws(value);

 		if (sect==0 || key==0)
 		{
-			printf("-config : invalid parameter, format is section:key=value\n");
+			WARN_LOG(COMMON, "-config : invalid parameter, format is section:key=value");
 			return rv;
 		}

-		if (value==0)
-			value="";
-		printf("Virtual cfg %s:%s=%s\n",sect,key,value);
+		const char* constval = value;
+		if (constval==0)
+			constval="";
+		INFO_LOG(COMMON, "Virtual cfg %s:%s=%s", sect, key, constval);

-		cfgSetVitual(sect,key,value);
+		cfgSetVirtual(sect, key, constval);
 		rv++;

 		if (cl>=3 && stricmp(arg[2],",")==0)
@@ -98,41 +99,68 @@ int setconfig(wchar** arg,int cl)
 	return rv;
 }

-int showhelp(wchar** arg,int cl)
+static int showhelp()
 {
-	printf("Available commands :\n");
-
-	printf("-config	section:key=value [, ..]: add a virtual config value\n Virtual config values wont be saved to the .cfg file\n unless a different value is writen to em\nNote :\n You can specify many settings in the xx:yy=zz , gg:hh=jj , ...\n format.The spaces betwen the values and ',' are needed.");
+	printf("Usage: flycast [OPTION]... [CONTENT]\n\n");
+	printf("Options:\n");
+	printf("-config	section:key=value     add a virtual config value;\n");
+	printf("                              virtual config values won't be saved to the .cfg file\n");
+	printf("                              unless a different value is written to them\n");
+	printf("-help                         display this help\n");

+	exit(0);
 	return 0;
 }
-bool ParseCommandLine(int argc,wchar* argv[])
-{

+bool ParseCommandLine(int argc,char* argv[])
+{
+	settings.imgread.ImagePath[0] = '\0';
 	int cl=argc-2;
-	wchar** arg=argv+1;
+	char** arg=argv+1;
 	while(cl>=0)
 	{
-		if (stricmp(*arg,"-help")==0)
+		if (stricmp(*arg,"-help")==0 || stricmp(*arg,"--help")==0)
 		{
-			int as=showhelp(arg,cl);
-			cl-=as;
-			arg+=as;
-			return true;
+			showhelp();
 		}
-		else if (stricmp(*arg,"-config")==0)
+		else if (stricmp(*arg,"-config")==0 || stricmp(*arg,"--config")==0)
 		{
 			int as=setconfig(arg,cl);
 			cl-=as;
 			arg+=as;
 		}
+#if defined(__APPLE__)
+		else if (!strncmp(*arg, "-NSDocumentRevisions", 20))
+		{
+			arg++;
+			cl--;
+		}
+#endif
 		else
 		{
-			printf("wtf %s is suposed to do ?\n",*arg);
+			char* extension = strrchr(*arg, '.');
+
+			if (extension
+				&& (stricmp(extension, ".cdi") == 0 || stricmp(extension, ".chd") == 0
+					|| stricmp(extension, ".gdi") == 0 || stricmp(extension, ".cue") == 0))
+			{
+				INFO_LOG(COMMON, "Using '%s' as cd image", *arg);
+				strcpy(settings.imgread.ImagePath, *arg);
+			}
+			else if (extension && stricmp(extension, ".elf") == 0)
+			{
+				INFO_LOG(COMMON, "Using '%s' as reios elf file", *arg);
+				cfgSetVirtual("config", "bios.UseReios", "yes");
+				strcpy(settings.imgread.ImagePath, *arg);
+			}
+			else
+			{
+				INFO_LOG(COMMON, "Using '%s' as rom", *arg);
+				strcpy(settings.imgread.ImagePath, *arg);
+			}
 		}
 		arg++;
 		cl--;
 	}
-	printf("\n");
 	return false;
-}
+}
@@ -0,0 +1,312 @@
+#include "ini.h"
+#include "types.h"
+#include <sstream>
+
+char* trim_ws(char* str);
+
+namespace emucfg {
+
+/* ConfigEntry */
+
+const std::string& ConfigEntry::get_string() const
+{
+	return this->value;
+}
+
+int ConfigEntry::get_int()
+{
+	if (strstr(this->value.c_str(), "0x") != NULL)
+	{
+		return (int)strtoul(this->value.c_str(), NULL, 16);
+	}
+	else
+	{
+		return atoi(this->value.c_str());
+	}
+}
+
+bool ConfigEntry::get_bool()
+{
+	if (stricmp(this->value.c_str(), "yes") == 0 ||
+		  stricmp(this->value.c_str(), "true") == 0 ||
+		  stricmp(this->value.c_str(), "on") == 0 ||
+		  stricmp(this->value.c_str(), "1") == 0)
+	{
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+/* ConfigSection */
+
+bool ConfigSection::has_entry(const std::string& name)
+{
+	return (this->entries.count(name) == 1);
+}
+
+ConfigEntry* ConfigSection::get_entry(const std::string& name)
+{
+	if(this->has_entry(name))
+	{
+		return &this->entries[name];
+	}
+	return NULL;
+}
+
+void ConfigSection::set(const std::string& name, const std::string& value)
+{
+	ConfigEntry new_entry = { value };
+	this->entries[name] = new_entry;
+}
+
+void ConfigSection::delete_entry(const std::string& name)
+{
+	this->entries.erase(name);
+}
+
+/* ConfigFile */
+
+ConfigSection* ConfigFile::add_section(const std::string& name, bool is_virtual)
+{
+	ConfigSection new_section;
+	if (is_virtual)
+	{
+		this->virtual_sections.insert(std::make_pair(name, new_section));
+		return &this->virtual_sections[name];
+	}
+	this->sections.insert(std::make_pair(name, new_section));
+	return &this->sections[name];
+}
+
+bool ConfigFile::has_section(const std::string& name)
+{
+	return (this->virtual_sections.count(name) == 1 || this->sections.count(name) == 1);
+}
+
+bool ConfigFile::has_entry(const std::string& section_name, const std::string& entry_name)
+{
+	ConfigSection* section = this->get_section(section_name, true);
+	if ((section != NULL) && section->has_entry(entry_name))
+	{
+		return true;
+	}
+	section = this->get_section(section_name, false);
+	return ((section != NULL) && section->has_entry(entry_name));
+}
+
+ConfigSection* ConfigFile::get_section(const std::string& name, bool is_virtual)
+{
+	if(is_virtual)
+	{
+		if (this->virtual_sections.count(name) == 1)
+		{
+			return &this->virtual_sections[name];
+		}
+	}
+	else
+	{
+		if (this->sections.count(name) == 1)
+		{
+			return &this->sections[name];
+		}
+	}
+	return NULL;
+}
+
+ConfigEntry* ConfigFile::get_entry(const std::string& section_name, const std::string& entry_name)
+{
+	ConfigSection* section = this->get_section(section_name, true);
+	if(section != NULL && section->has_entry(entry_name))
+	{
+		return section->get_entry(entry_name);
+	}
+
+		section = this->get_section(section_name, false);
+	if(section != NULL)
+	{
+		return section->get_entry(entry_name);
+	}
+	return NULL;
+
+}
+
+std::string ConfigFile::get(const std::string& section_name, const std::string& entry_name, const std::string& default_value)
+{
+	ConfigEntry* entry = this->get_entry(section_name, entry_name);
+	if (entry == NULL)
+	{
+		return default_value;
+	}
+	else
+	{
+		return entry->get_string();
+	}
+}
+
+int ConfigFile::get_int(const std::string& section_name, const std::string& entry_name, int default_value)
+{
+	ConfigEntry* entry = this->get_entry(section_name, entry_name);
+	if (entry == NULL)
+	{
+		return default_value;
+	}
+	else
+	{
+		return entry->get_int();
+	}
+}
+
+bool ConfigFile::get_bool(const std::string& section_name, const std::string& entry_name, bool default_value)
+{
+	ConfigEntry* entry = this->get_entry(section_name, entry_name);
+	if (entry == NULL)
+	{
+		return default_value;
+	}
+	else
+	{
+		return entry->get_bool();
+	}
+}
+
+void ConfigFile::set(const std::string& section_name, const std::string& entry_name, const std::string& value, bool is_virtual)
+{
+	ConfigSection* section = this->get_section(section_name, is_virtual);
+	if(section == NULL)
+	{
+		section = this->add_section(section_name, is_virtual);
+	}
+	section->set(entry_name, value);
+}
+
+void ConfigFile::set_int(const std::string& section_name, const std::string& entry_name, int value, bool is_virtual)
+{
+	std::stringstream str_value;
+	str_value << value;
+	this->set(section_name, entry_name, str_value.str(), is_virtual);
+}
+
+void ConfigFile::set_bool(const std::string& section_name, const std::string& entry_name, bool value, bool is_virtual)
+{
+	std::string str_value = (value ? "yes" : "no");
+	this->set(section_name, entry_name, str_value, is_virtual);
+}
+
+void ConfigFile::parse(FILE* file)
+{
+	if(file == NULL)
+	{
+		return;
+	}
+	char line[512];
+	char current_section[512] = { '\0' };
+	int cline = 0;
+	while(file && !feof(file))
+	{
+		if (std::fgets(line, 512, file) == NULL || std::feof(file))
+		{
+			break;
+		}
+
+		cline++;
+
+		if (strlen(line) < 3)
+		{
+			continue;
+		}
+
+		if (line[strlen(line)-1] == '\r' ||
+			  line[strlen(line)-1] == '\n')
+		{
+			line[strlen(line)-1] = '\0';
+		}
+
+		char* tl = trim_ws(line);
+
+		if (tl[0] == '[' && tl[strlen(tl)-1] == ']')
+		{
+			tl[strlen(tl)-1] = '\0';
+
+			// FIXME: Data loss if buffer is too small
+			strncpy(current_section, tl+1, sizeof(current_section));
+			current_section[sizeof(current_section) - 1] = '\0';
+
+			trim_ws(current_section);
+		}
+		else
+		{
+			if (strlen(current_section) == 0)
+			{
+				continue; //no open section
+			}
+
+			char* separator = strstr(tl, "=");
+
+			if (!separator)
+			{
+				WARN_LOG(COMMON, "Malformed entry on config - ignoring @ %d(%s)", cline, tl);
+				continue;
+			}
+
+			*separator = '\0';
+
+			char* name = trim_ws(tl);
+			char* value = trim_ws(separator + 1);
+			if (name == NULL || value == NULL)
+			{
+				//printf("Malformed entry on config - ignoring @ %d(%s)\n",cline, tl);
+				continue;
+			}
+			else
+			{
+				this->set(std::string(current_section), std::string(name), std::string(value));
+			}
+		}
+	}
+}
+
+void ConfigFile::save(FILE* file)
+{
+	for (const auto& section_it : this->sections)
+	{
+		const std::string& section_name = section_it.first;
+		const ConfigSection& section = section_it.second;
+
+		std::fprintf(file, "[%s]\n", section_name.c_str());
+
+		for (const auto& entry_it : section.entries)
+		{
+			const std::string& entry_name = entry_it.first;
+			const ConfigEntry& entry = entry_it.second;
+			std::fprintf(file, "%s = %s\n", entry_name.c_str(), entry.get_string().c_str());
+		}
+
+		std::fputs("\n", file);
+	}
+}
+
+void ConfigFile::delete_section(const std::string& section_name) {
+	sections.erase(section_name);
+	virtual_sections.erase(section_name);
+}
+
+void ConfigFile::delete_entry(const std::string& section_name, const std::string& entry_name)
+{
+	ConfigSection *section = get_section(section_name, false);
+	if (section != NULL)
+		section->delete_entry(entry_name);
+}
+
+bool ConfigFile::is_virtual(const std::string& section_name, const std::string& entry_name)
+{
+	ConfigSection *section = get_section(section_name, true);
+	if (section == nullptr)
+		return false;
+	return section->has_entry(entry_name);
+}
+
+} // namespace emucfg
+
@@ -0,0 +1,55 @@
+#pragma once
+
+#include <cstdio>
+#include <map>
+#include <string>
+
+namespace emucfg {
+
+struct ConfigEntry {
+	std::string value;
+	const std::string& get_string() const;
+	int get_int();
+	bool get_bool();
+};
+
+struct ConfigSection {
+	std::map<std::string, ConfigEntry> entries;
+	bool has_entry(const std::string& name);
+	void set(const std::string& name, const std::string& value);
+	void delete_entry(const std::string& name);
+	ConfigEntry* get_entry(const std::string& name);
+};
+
+struct ConfigFile {
+	private:
+		std::map<std::string, ConfigSection> sections;
+		std::map<std::string, ConfigSection> virtual_sections;
+		ConfigSection* add_section(const std::string& name, bool is_virtual);
+		ConfigSection* get_section(const std::string& name, bool is_virtual);
+		ConfigEntry* get_entry(const std::string& section_name, const std::string& entry_name);
+
+
+	public:
+		bool has_section(const std::string& name);
+		bool has_entry(const std::string& section_name, const std::string& entry_name);
+		bool is_virtual(const std::string& section_name, const std::string& entry_name);
+
+		void parse(FILE* file);
+		void save(FILE* file);
+
+		/* getting values */
+		std::string get(const std::string& section_name, const std::string& entry_name, const std::string& default_value = "");
+		int get_int(const std::string& section_name, const std::string& entry_name, int default_value = 0);
+		bool get_bool(const std::string& section_name, const std::string& entry_name, bool default_value = false);
+		/* setting values */
+		void set(const std::string& section_name, const std::string& entry_name, const std::string& value, bool is_virtual = false);
+		void set_int(const std::string& section_name, const std::string& entry_name, int value, bool is_virtual = false);
+		void set_bool(const std::string& section_name, const std::string& entry_name, bool value, bool is_virtual = false);
+
+		void delete_section(const std::string& section_name);
+		void delete_entry(const std::string& section_name, const std::string& entry_name);
+};
+
+} // namespace emucfg
+
@@ -0,0 +1,159 @@
+/*
+	Copyright 2021 flyinghead
+
+	This file is part of Flycast.
+
+    Flycast is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Flycast is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
+*/
+#include "option.h"
+
+namespace config {
+
+// Dynarec
+
+Option<bool> DynarecEnabled("Dynarec.Enabled", true);
+Option<bool> DynarecIdleSkip("Dynarec.idleskip", true);
+Option<bool> DynarecSafeMode("Dynarec.safe-mode");
+
+// General
+
+Option<int> Cable("Dreamcast.Cable", 3);			// TV Composite
+Option<int> Region("Dreamcast.Region", 1);			// USA
+Option<int> Broadcast("Dreamcast.Broadcast", 0);	// NTSC
+Option<int> Language("Dreamcast.Language", 1);		// English
+Option<bool> FullMMU("Dreamcast.FullMMU");
+Option<bool> ForceWindowsCE("Dreamcast.ForceWindowsCE");
+Option<bool> AutoLoadState("Dreamcast.AutoLoadState");
+Option<bool> AutoSaveState("Dreamcast.AutoSaveState");
+Option<int> SavestateSlot("Dreamcast.SavestateSlot");
+
+// Sound
+
+Option<bool> DSPEnabled("aica.DSPEnabled", false);
+Option<bool> DisableSound("aica.NoSound");
+#if HOST_CPU == CPU_ARM
+Option<int> AudioBufferSize("aica.BufferSize", 5644);	// 128 ms
+#else
+Option<int> AudioBufferSize("aica.BufferSize", 2822);	// 64 ms
+#endif
+Option<bool> AutoLatency("aica.AutoLatency",
+#ifdef __ANDROID__
+		true
+#else
+		false
+#endif
+		);
+
+OptionString AudioBackend("backend", "auto", "audio");
+AudioVolumeOption AudioVolume;
+
+// Rendering
+
+RendererOption RendererType;
+Option<bool> UseMipmaps("rend.UseMipmaps", true);
+Option<bool> Widescreen("rend.WideScreen");
+Option<bool> SuperWidescreen("rend.SuperWideScreen");
+Option<bool> ShowFPS("rend.ShowFPS");
+Option<bool> RenderToTextureBuffer("rend.RenderToTextureBuffer");
+Option<bool> TranslucentPolygonDepthMask("rend.TranslucentPolygonDepthMask");
+Option<bool> ModifierVolumes("rend.ModifierVolumes", true);
+Option<int> TextureUpscale("rend.TextureUpscale", 1);
+Option<int> MaxFilteredTextureSize("rend.MaxFilteredTextureSize", 256);
+Option<float> ExtraDepthScale("rend.ExtraDepthScale", 1.f);
+Option<bool> CustomTextures("rend.CustomTextures");
+Option<bool> DumpTextures("rend.DumpTextures");
+Option<int> ScreenStretching("rend.ScreenStretching", 100);
+Option<bool> Fog("rend.Fog", true);
+Option<bool> FloatVMUs("rend.FloatVMUs");
+Option<bool> Rotate90("rend.Rotate90");
+Option<bool> PerStripSorting("rend.PerStripSorting");
+#ifdef __APPLE__
+Option<bool> DelayFrameSwapping("rend.DelayFrameSwapping", false);
+#else
+Option<bool> DelayFrameSwapping("rend.DelayFrameSwapping", true);
+#endif
+Option<bool> WidescreenGameHacks("rend.WidescreenGameHacks");
+std::array<Option<int>, 4> CrosshairColor {
+	Option<int>("rend.CrossHairColor1"),
+	Option<int>("rend.CrossHairColor2"),
+	Option<int>("rend.CrossHairColor3"),
+	Option<int>("rend.CrossHairColor4"),
+};
+Option<int> SkipFrame("ta.skip");
+Option<int> MaxThreads("pvr.MaxThreads", 3);
+Option<int> AutoSkipFrame("pvr.AutoSkipFrame", 0);
+Option<int> RenderResolution("rend.Resolution", 480);
+Option<bool> VSync("rend.vsync", true);
+Option<u64> PixelBufferSize("rend.PixelBufferSize", 512 * 1024 * 1024);
+Option<int> AnisotropicFiltering("rend.AnisotropicFiltering", 1);
+Option<bool> ThreadedRendering("rend.ThreadedRendering", true);
+
+// Misc
+
+Option<bool> SerialConsole("Debug.SerialConsoleEnabled");
+Option<bool> SerialPTY("Debug.SerialPTY");
+Option<bool> UseReios("UseReios");
+Option<bool> FastGDRomLoad("FastGDRomLoad", false);
+
+Option<bool> OpenGlChecks("OpenGlChecks", false, "validate");
+
+Option<std::vector<std::string>, false> ContentPath("Dreamcast.ContentPath");
+Option<bool, false> HideLegacyNaomiRoms("Dreamcast.HideLegacyNaomiRoms", true);
+
+// Network
+
+Option<bool> NetworkEnable("Enable", false, "network");
+Option<bool> ActAsServer("ActAsServer", false, "network");
+OptionString DNS("DNS", "46.101.91.123", "network");
+OptionString NetworkServer("server", "", "network");
+Option<bool> EmulateBBA("EmulateBBA", false, "network");
+
+#ifdef SUPPORT_DISPMANX
+Option<bool> DispmanxMaintainAspect("maintain_aspect", true, "dispmanx");
+#endif
+
+#ifdef USE_OMX
+Option<int> OmxAudioLatency("audio_latency", 100, "omx");
+Option<bool> OmxAudioHdmi("audio_hdmi", true, "omx");
+#endif
+
+// Maple
+
+Option<int> MouseSensitivity("MouseSensitivity", 100, "input");
+Option<int> VirtualGamepadVibration("VirtualGamepadVibration", 20, "input");
+
+std::array<Option<MapleDeviceType>, 4> MapleMainDevices {
+	Option<MapleDeviceType>("device1", MDT_SegaController, "input"),
+	Option<MapleDeviceType>("device2", MDT_None, "input"),
+	Option<MapleDeviceType>("device3", MDT_None, "input"),
+	Option<MapleDeviceType>("device4", MDT_None, "input"),
+};
+std::array<std::array<Option<MapleDeviceType>, 2>, 4> MapleExpansionDevices {
+	Option<MapleDeviceType>("device1.1", MDT_SegaVMU, "input"),
+	Option<MapleDeviceType>("device1.2", MDT_SegaVMU, "input"),
+
+	Option<MapleDeviceType>("device2.1", MDT_None, "input"),
+	Option<MapleDeviceType>("device2.2", MDT_None, "input"),
+
+	Option<MapleDeviceType>("device3.1", MDT_None, "input"),
+	Option<MapleDeviceType>("device3.2", MDT_None, "input"),
+
+	Option<MapleDeviceType>("device4.1", MDT_None, "input"),
+	Option<MapleDeviceType>("device4.2", MDT_None, "input"),
+};
+#ifdef _WIN32
+Option<bool> UseRawInput("RawInput", false, "input");
+#endif
+
+} // namespace config
@@ -0,0 +1,519 @@
+/*
+	Copyright 2021 flyinghead
+
+	This file is part of Flycast.
+
+    Flycast is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Flycast is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
+*/
+#pragma once
+#include <string>
+#include <vector>
+#include <array>
+#include <cmath>
+#include "cfg.h"
+#include "hw/maple/maple_cfg.h"
+#ifdef LIBRETRO
+#include <libretro.h>
+#endif
+
+namespace config {
+
+class BaseOption {
+public:
+	virtual ~BaseOption() = default;
+	virtual void save() const = 0;
+	virtual void load() = 0;
+	virtual void reset() = 0;
+};
+
+#ifdef LIBRETRO
+#include "option_lr.h"
+#else
+
+class Settings {
+public:
+	void reset() {
+		for (const auto& o : options)
+			o->reset();
+		gameId.clear();
+		perGameConfig = false;
+	}
+
+	void load(bool gameSpecific) {
+		if (gameSpecific)
+		{
+			if (gameId.empty())
+				return;
+			if (!cfgHasSection(gameId))
+				return;
+			perGameConfig = true;
+		}
+		for (const auto& o : options)
+			o->load();
+	}
+
+	void save() {
+		cfgSetAutoSave(false);
+		for (const auto& o : options)
+			o->save();
+		cfgSetAutoSave(true);
+	}
+
+	const std::string& getGameId() const {
+		return gameId;
+	}
+
+	void setGameId(const std::string& gameId) {
+		this->gameId = gameId;
+	}
+
+	bool hasPerGameConfig() const {
+		return perGameConfig;
+	}
+	void setPerGameConfig(bool perGameConfig) {
+		this->perGameConfig = perGameConfig;
+		if (!perGameConfig) {
+			if (!gameId.empty())
+				cfgDeleteSection(gameId);
+			reset();
+		}
+	}
+
+	static Settings& instance() {
+		static Settings *_instance = new Settings();
+		return *_instance;
+	}
+
+private:
+	std::vector<BaseOption *> options;
+	std::string gameId;
+	bool perGameConfig = false;
+
+	template<typename T, bool PerGameOption>
+	friend class Option;
+};
+
+// Missing in C++11
+template <bool B, typename T = void>
+using enable_if_t = typename std::enable_if<B, T>::type;
+
+template<typename T, bool PerGameOption = true>
+class Option : public BaseOption {
+public:
+	Option(const std::string& name, T defaultValue = T(), const std::string& section = "config")
+		: section(section), name(name), value(defaultValue), defaultValue(defaultValue),
+		  settings(Settings::instance())
+	{
+		settings.options.push_back(this);
+	}
+
+	void reset() override {
+		set(defaultValue);
+		overridden = false;
+	}
+
+	void load() override {
+		if (PerGameOption && settings.hasPerGameConfig())
+			set(doLoad(settings.getGameId(), section + "." + name));
+		else
+		{
+			set(doLoad(section, name));
+			if (cfgIsVirtual(section, name))
+				override(value);
+		}
+	}
+
+	void save() const override
+	{
+		if (overridden) {
+			if (value == overriddenDefault)
+				return;
+			if (!settings.hasPerGameConfig())
+				// overridden options can only be saved in per-game settings
+				return;
+		}
+		else if (PerGameOption && settings.hasPerGameConfig())
+		{
+			if (value == doLoad(section, name))
+				return;
+		}
+		if (PerGameOption && settings.hasPerGameConfig())
+			doSave(settings.getGameId(), section + "." + name);
+		else
+			doSave(section, name);
+	}
+
+	T& get() { return value; }
+	void set(T v) { value = v; }
+
+	void override(T v) {
+		verify(PerGameOption);
+		overriddenDefault = v;
+		overridden = true;
+		value = v;
+	}
+	bool isReadOnly() const {
+		return overridden && !settings.hasPerGameConfig();
+	}
+
+	explicit operator T() const { return value; }
+	operator T&() { return value; }
+	T& operator=(const T& v) { set(v); return value; }
+
+protected:
+	template <typename U = T>
+	enable_if_t<std::is_same<U, bool>::value, T>
+	doLoad(const std::string& section, const std::string& name) const
+	{
+		return cfgLoadBool(section, name, value);
+	}
+
+	template <typename U = T>
+	enable_if_t<(std::is_integral<U>::value || std::is_enum<U>::value)
+			&& !std::is_same<U, bool>::value, T>
+	doLoad(const std::string& section, const std::string& name) const
+	{
+		return (T)cfgLoadInt(section, name, (int)value);
+	}
+
+	template <typename U = T>
+	enable_if_t<std::is_same<U, std::string>::value, T>
+	doLoad(const std::string& section, const std::string& name) const
+	{
+		return cfgLoadStr(section, name, value);
+	}
+
+	template <typename U = T>
+	enable_if_t<std::is_same<float, U>::value, T>
+	doLoad(const std::string& section, const std::string& name) const
+	{
+		std::string strValue = cfgLoadStr(section, name, "");
+		if (strValue.empty())
+			return value;
+		else
+			return atof(strValue.c_str());
+	}
+
+	template <typename U = T>
+	enable_if_t<std::is_same<std::vector<std::string>, U>::value, T>
+	doLoad(const std::string& section, const std::string& name) const
+	{
+		std::string paths = cfgLoadStr(section, name, "");
+		if (paths.empty())
+			return value;
+		std::string::size_type start = 0;
+		std::vector<std::string> newValue;
+		while (true)
+		{
+			if (paths[start] == '"')
+			{
+				std::string v;
+				start++;
+				while (true)
+				{
+					if (paths[start] == '"')
+					{
+						if (start + 1 >= paths.size())
+						{
+							newValue.push_back(v);
+							return newValue;
+						}
+						if (paths[start + 1] == '"')
+						{
+							v += paths[start++];
+							start++;
+						}
+						else if (paths[start + 1] == ';')
+						{
+							newValue.push_back(v);
+							start += 2;
+							break;
+						}
+						else
+						{
+							v += paths[start++];
+						}
+					}
+					else
+						v += paths[start++];
+				}
+			}
+			else
+			{
+				std::string::size_type end = paths.find(';', start);
+				if (end == std::string::npos)
+					end = paths.size();
+				if (start != end)
+					newValue.push_back(paths.substr(start, end - start));
+				if (end == paths.size())
+					break;
+				start = end + 1;
+			}
+		}
+		return newValue;
+	}
+
+	template <typename U = T>
+	enable_if_t<std::is_same<U, bool>::value>
+	doSave(const std::string& section, const std::string& name) const
+	{
+		cfgSaveBool(section, name, value);
+	}
+
+	template <typename U = T>
+	enable_if_t<(std::is_integral<U>::value || std::is_enum<U>::value)
+		&& !std::is_same<U, bool>::value>
+	doSave(const std::string& section, const std::string& name) const
+	{
+		cfgSaveInt(section, name, (int)value);
+	}
+
+	template <typename U = T>
+	enable_if_t<std::is_same<U, std::string>::value>
+	doSave(const std::string& section, const std::string& name) const
+	{
+		cfgSaveStr(section, name, value);
+	}
+
+	template <typename U = T>
+	enable_if_t<std::is_same<float, U>::value>
+	doSave(const std::string& section, const std::string& name) const
+	{
+		char buf[64];
+		snprintf(buf, sizeof(buf), "%f", value);
+		cfgSaveStr(section, name, buf);
+	}
+
+	template <typename U = T>
+	enable_if_t<std::is_same<std::vector<std::string>, U>::value>
+	doSave(const std::string& section, const std::string& name) const
+	{
+		std::string s;
+		for (const auto& v : value)
+		{
+			if (!s.empty())
+				s += ';';
+			if (v.find(';') != std::string::npos || (!v.empty() && v[0] == '"'))
+			{
+				s += '"';
+				std::string v2 = v;
+				while (true)
+				{
+					auto pos = v2.find('"');
+					if (pos != std::string::npos)
+					{
+						s += v2.substr(0, pos + 1) + '"';
+						v2 = v2.substr(pos + 1);
+					}
+					else
+					{
+						s += v2;
+						break;
+					}
+				}
+				s += '"';
+			}
+			else
+				s += v;
+		}
+		cfgSaveStr(section, name, s);
+	}
+
+	std::string section;
+	std::string name;
+	T value;
+	T defaultValue;
+	T overriddenDefault = T();
+	bool overridden = false;
+	Settings& settings;
+};
+#endif
+
+using OptionString = Option<std::string>;
+
+// Dynarec
+
+extern Option<bool> DynarecEnabled;
+extern Option<bool> DynarecIdleSkip;
+extern Option<bool> DynarecSafeMode;
+
+// General
+
+extern Option<int> Cable;		// 0 -> VGA, 1 -> VGA, 2 -> RGB, 3 -> TV Composite
+extern Option<int> Region;		// 0 -> JP, 1 -> USA, 2 -> EU, 3 -> default
+extern Option<int> Broadcast;	// 0 -> NTSC, 1 -> PAL, 2 -> PAL/M, 3 -> PAL/N, 4 -> default
+extern Option<int> Language;	// 0 -> JP, 1 -> EN, 2 -> DE, 3 -> FR, 4 -> SP, 5 -> IT, 6 -> default
+extern Option<bool> FullMMU;
+extern Option<bool> ForceWindowsCE;
+extern Option<bool> AutoLoadState;
+extern Option<bool> AutoSaveState;
+extern Option<int> SavestateSlot;
+
+// Sound
+
+constexpr bool LimitFPS = true;
+extern Option<bool> DSPEnabled;
+extern Option<bool> DisableSound;
+extern Option<int> AudioBufferSize;	//In samples ,*4 for bytes
+extern Option<bool> AutoLatency;
+
+extern OptionString AudioBackend;
+
+class AudioVolumeOption : public Option<int> {
+public:
+	AudioVolumeOption() : Option<int>("aica.Volume", 100) {};
+	float logarithmic_volume_scale = 1.0;
+
+	void load() override {
+		Option<int>::load();
+		calcDbPower();
+	}
+
+	float dbPower()
+	{
+		return logarithmic_volume_scale;
+	}
+	void calcDbPower()
+	{
+		// dB scaling calculation: https://www.dr-lex.be/info-stuff/volumecontrols.html
+		logarithmic_volume_scale = fmin(exp(4.605 * float(value) / 100.0) / 100.0, 1.0);
+		if (value < 10)
+			logarithmic_volume_scale *= value / 10.0;
+	}
+};
+extern AudioVolumeOption AudioVolume;
+
+// Rendering
+
+class RendererOption : public Option<RenderType> {
+public:
+	RendererOption()
+#ifdef _WIN32
+		: Option<RenderType>("pvr.rend", RenderType::DirectX9) {}
+#else
+		: Option<RenderType>("pvr.rend", RenderType::OpenGL) {}
+#endif
+
+	bool isOpenGL() const {
+		return value == RenderType::OpenGL || value == RenderType::OpenGL_OIT;
+	}
+	bool isVulkan() const {
+		return value == RenderType::Vulkan || value == RenderType::Vulkan_OIT;
+	}
+	bool isDirectX() const {
+		return value == RenderType::DirectX9;
+	}
+
+	void set(RenderType v)
+	{
+		newValue = v;
+	}
+	RenderType& operator=(const RenderType& v) { set(v); return value; }
+
+	void load() override {
+		RenderType current = value;
+		Option<RenderType>::load();
+		newValue = value;
+		value = current;
+	}
+
+	void reset() override {
+		// don't reset the value to avoid vk -> gl -> vk quick switching
+		overridden = false;
+	}
+
+	bool pendingChange() {
+		return newValue != value;
+	}
+	void commit() {
+		value = newValue;
+	}
+
+private:
+	RenderType newValue = RenderType();
+};
+extern RendererOption RendererType;
+extern Option<bool> UseMipmaps;
+extern Option<bool> Widescreen;
+extern Option<bool> SuperWidescreen;
+extern Option<bool> ShowFPS;
+extern Option<bool> RenderToTextureBuffer;
+extern Option<bool> TranslucentPolygonDepthMask;
+extern Option<bool> ModifierVolumes;
+constexpr bool Clipping = true;
+extern Option<int> TextureUpscale;
+extern Option<int> MaxFilteredTextureSize;
+extern Option<float> ExtraDepthScale;
+extern Option<bool> CustomTextures;
+extern Option<bool> DumpTextures;
+extern Option<int> ScreenStretching;	// in percent. 150 means stretch from 4/3 to 6/3
+extern Option<bool> Fog;
+extern Option<bool> FloatVMUs;
+extern Option<bool> Rotate90;
+extern Option<bool> PerStripSorting;
+extern Option<bool> DelayFrameSwapping;	// Delay swapping frame until FB_R_SOF matches FB_W_SOF
+extern Option<bool> WidescreenGameHacks;
+extern std::array<Option<int>, 4> CrosshairColor;
+extern Option<int> SkipFrame;
+extern Option<int> MaxThreads;
+extern Option<int> AutoSkipFrame;		// 0: none, 1: some, 2: more
+extern Option<int> RenderResolution;
+extern Option<bool> VSync;
+extern Option<u64> PixelBufferSize;
+extern Option<int> AnisotropicFiltering;
+extern Option<bool> ThreadedRendering;
+
+// Misc
+
+extern Option<bool> SerialConsole;
+extern Option<bool> SerialPTY;
+extern Option<bool> UseReios;
+extern Option<bool> FastGDRomLoad;
+
+extern Option<bool> OpenGlChecks;
+
+extern Option<std::vector<std::string>, false> ContentPath;
+extern Option<bool, false> HideLegacyNaomiRoms;
+
+// Network
+
+extern Option<bool> NetworkEnable;
+extern Option<bool> ActAsServer;
+extern OptionString DNS;
+extern OptionString NetworkServer;
+extern Option<bool> EmulateBBA;
+
+#ifdef SUPPORT_DISPMANX
+extern Option<bool> DispmanxMaintainAspect;
+#endif
+
+#ifdef USE_OMX
+extern Option<int> OmxAudioLatency;
+extern Option<bool> OmxAudioHdmi;
+#endif
+
+// Maple
+
+extern Option<int> MouseSensitivity;
+extern Option<int> VirtualGamepadVibration;
+extern std::array<Option<MapleDeviceType>, 4> MapleMainDevices;
+extern std::array<std::array<Option<MapleDeviceType>, 2>, 4> MapleExpansionDevices;
+#ifdef _WIN32
+extern Option<bool> UseRawInput;
+#else
+constexpr bool UseRawInput = false;
+#endif
+
+} // namespace config
+
@@ -0,0 +1,523 @@
+/*
+    Created on: Sep 23, 2019
+
+	Credits for cheats: Esppiral, S4pph4rad, yzb37859365, Shenmue_Trilogy, Radaron, Virgin KLM, Joel, Zorlon,
+		ELOTROLADO.NET, SEGARETRO.ORG, Sakuragi @ emutalk.net
+	Copyright 2019 flyinghead
+
+	This file is part of Flycast.
+
+    Flycast is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Flycast is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#include "cheats.h"
+#include "hw/sh4/sh4_mem.h"
+#include "reios/reios.h"
+#include "network/picoppp.h"
+#include "cfg/cfg.h"
+
+const WidescreenCheat CheatManager::widescreen_cheats[] =
+{
+		{ "MK-51064",   nullptr,    { 0x39EFF4, 0 }, { 0x43700000 } },		// 18 wheeler (USA)
+		{ "MK-5106450", nullptr,    { 0x39EFF4, 0 }, { 0x43700000 } },		// 18 wheeler (PAL)
+		{ "HDR-0080",   nullptr,    { 0x6625C0, 0 }, { 0x43700000 } },		// 18 wheeler (JP)
+		{ "T-9708N",    nullptr,    { 0x0AD5B0, 0x112E00, 0 }, { 0x4A2671C4, 0x401CCCCD } },	// 4 Wheel Thunder (USA)
+		{ "MK-5119050", nullptr,    { 0x104A34, 0 }, { 0x3F52CCCD } },		// 90 Minutes - Sega Championship Football (PAL)
+		{ "T40209D 50", nullptr,    { 0x2A8750, 0 }, { 0x3F400000 } },		// AeroWings 2 (PAL)
+		{ "T34101M",    nullptr,    { 0x24CF20, 0x24CEEC, 0 }, { 0x3FAAAAAB, 0x43F00000, 0 } },	// Animastar (JP)
+		{ "MK-51171",   nullptr,    { 0xCA20B8, 0 }, { 0x43700000 } },		// Alien Front Online (USA)
+		{ "T2101M",     nullptr,    { 0x13E8B4, 0x13E8E4, 0 }, { 0x43F00000, 0x3F400000 } },	// Berserk (JP)
+		{ "T13001D 18", nullptr,    { 0x2DAC44, 0 }, { 0x3F400000 } },		// Blue Stinger (En, De) (PAL)
+		{ "xxxxxxxxxx", nullptr,    { 0x2DAB84, 0 }, { 0x3F400000 } },		// Blue Stinger (Fr) (PAL)
+		{ "T13001D-05", nullptr,    { 0x2D9C84, 0 }, { 0x3F400000 } },		// Blue Stinger (Es, It?) (PAL)
+		{ "T13001N",    nullptr,    { 0x2D9CA4, 0 }, { 0x3F400000 } },		// Blue Stinger (USA)
+		{ "HDR-0003",   nullptr,    { 0x2D6D80, 0 }, { 0x3F400000 } },		// Blue Stinger (JP)
+		{ "T42903M",    nullptr,    { 0x286E2C, 0x286E5C, 0 }, { 0x43F00000, 0x3F400000 } },	// Bomber Hehhe! (JP)
+		{ "MK-51065",   nullptr,    { 0x387B84, 0x387BB4, 0 }, { 0x43F00000, 0x3F400000 } },	// Bomberman Online (USA)
+		{ "T6801M",     nullptr,    { 0x042F3C, 0 }, { 0x4384BC09 } },		// Buggy Heat (JP)
+		{ "T46601D 05", nullptr,    { 0xBB3D14, 0 }, { 0x440A7C9A } },		// Cannon Spike (PAL)
+		{ "T1215N",     nullptr,    { 0xBB3C74, 0 }, { 0x440A7C9A } },		// Cannon Spike (USA)
+		{ "T44901D 50", nullptr,    { 0xB0109C, 0xB010CC, 0 }, { 0x43F00000, 0x3F400000 } },	// Carrier (PAL)
+		{ "T5701N",     nullptr,    { 0xAFD93C, 0xAFD96C, 0 }, { 0x43F00000, 0x3F400000 } },	// Carrier (USA)
+		// Capcom vs. SNK Pro (JP)
+		// You can see the end of the backgrounds on each side. The HUD is shifted to the right.
+		// Code 2 sets HUD and movements of the characters to a 4:3 zone
+		{ "T1247M",     nullptr,    { 0x1E8238, 0x3D3658, 0x3D3628, 0 }, { 0x43F00000, 0x43D20000, 0x43700000 } },
+		// Capcom vs. SNK 2 (JP)
+		// You can see the end of the backgrounds on each side.
+		{ "T1249M",     nullptr,    { 0x39BFD8, 0x34E9E8, 0x34EFBC, 0 }, { 0x43700000, 0x3F400000, 0x3F400000 } },
+		{ "T44902D 50", nullptr,    { 0x1DBFF8, 0 }, { 0x43700000 } },		// Charge ‘n Blast (PAL)
+		{ "T4402M",     nullptr,    { 0x1DA9E0, 0 }, { 0x43700000 } },		// Charge ‘n Blast (JP)
+		{ "MK-5104950", nullptr,    { 0x2D2D40, 0x2D2D70, 0 }, { 0x3F400000, 0xC2700000 } },	// ChuChu Rocket! (PAL)
+		{ "T44903D 50", nullptr,    { 0x315300, 0x315334, 0 }, { 0x43F00000, 0x3FAAAAAB } },	// Coaster Works (PAL)
+		// Confidential Mission (PAL) 022F0D58 43700000 - Only works on real Dreamcast
+		{ "T36901M",    nullptr,    { 0x1C8A98, 0 }, { 0x3F400000 } },		// Cool Boarders (JP)
+		{ "T3106M",     nullptr,    { 0x60B59C, 0 }, { 0x3F400000 } },		// Cool Cool Toon (JP)
+		{ "HDR-0176",   nullptr,    { 0x240FAC, 0 }, { 0x3F400000 } },		// Cosmic Smash (JP)
+		{ "MK-51035",   " U      ", { 0x2B08B0, 0 }, { 0x43700000 } },		// Crazy Taxi (USA)
+		{ "MK-51035",   "  E     ", { 0x2B3410, 0 }, { 0x43700000 } },		// Crazy Taxi (PAL)
+		{ "MK-5113650", nullptr,    { 0x2BFB70, 0 }, { 0x43700000 } },		// Crazy Taxi 2 (PAL)
+		{ "MK-51136",   nullptr,    { 0x2BDDD0, 0 }, { 0x43700000 } },		// Crazy Taxi 2 (USA)
+//		{ "HDR-0159",   nullptr,    { 0x2FBBD0, 0 }, { 0x43700000 } },		// Crazy Taxi 2 (JP) not working
+		{ "T13004N",    nullptr,    { 0x016D94, 0 }, { 0x44234E73 } },		// Cyber Troopers - Virtual On - Oratorio Tangram (USA)
+		// D2 (USA)
+		{ "MK-51036",   nullptr,    { 0x4B5CF4, 0x4B5CC4, 0x3E92A0, 0x3E92A8, 0x3E92C0, 0x3E92C8 },
+				{ 0x3F400000, 0x43F00000, 0, 0, 0, 0 } },
+		// D2 (JP)
+		{ "T30006M",    nullptr,    { 0x4CF42C, 0x4CF45C, 0x3E1A36, 0x3E1A34, 0x3E1A3C, 0x3E1A54, 0x3E1A5C, 0 },
+				{ 0x43F00000, 0x3F400000, 0x08010000, 0, 0, 0, 0 } },
+		{ "MK-5103750", nullptr,    { 0x1FE270, 0 }, { 0x43700000 } },		// Daytona USA (PAL)
+		{ "MK-51037",   nullptr,    { 0x1FC6D0, 0 }, { 0x43700000 } },		// Daytona USA (USA)
+		{ "T9501N-50",  nullptr,    { 0x9821D4, 0 }, { 0x3F400000 } },		// Deadly Skies (PAL)
+		{ "T8116D  50", nullptr,    { 0x2E5530, 0 }, { 0x43700000 } },		// Dead or Alive 2 (PAL)
+		{ "T3601N",     nullptr,    { 0x2F0670, 0 }, { 0x43700000 } },		// Dead or Alive 2 (USA)
+		{ "T3602M",     nullptr,    { 0x2FF798, 0 }, { 0x43700000 } },		// Dead or Alive 2 (JP)
+		{ "T3601M",     nullptr,    { 0x2FBBD0, 0x1E6658, 0 }, { 0x43700000, 0x4414C000 } },	// Dead or Alive 2: Limited Edition (JP) (code 1 fixes HUD)
+		{ "T2401N",     nullptr,    { 0x8BD5B4, 0x8BD5E4, 0 }, { 0x43F00000, 0x3F400000 } },	// Death Crimson OX (USA)
+		{ "T23201M",    nullptr,    { 0x819F44, 0x819F74, 0 }, { 0x43F00000, 0x3F400000 } },	// Death Crimson 2 (JP)
+		{ "T17714D50",  nullptr,    { 0x0D2ED0, 0x0D2ED4, 0 }, { 0x3FAAAAAB, 0x3F400000 } },	// Donald Duck: Quack Attack (PAL) (Code 1 corrects the HUD)
+		{ "T12503D-50", nullptr,    { 0x49CB24, 0 }, { 0x3F0CCCCD } },		// Dragons Blood (PAL)
+		{ "T17716D 50", nullptr,    { 0xF97F40, 0x08DCF8, 0 }, { 0x00000168, 0 } },		// Dragonriders: Chronicles of Pern (PAL)
+		{ "T17720N",    nullptr,    { 0xF97F40, 0x08DCF4, 0 }, { 0x00000168, 0 } },		// Dragonriders: Chronicles of Pern (USA) (Code 1 removes black bars)
+		{ "MK-5101350", nullptr,    { 0x4FCBC0, 0 }, { 0x43700000 } },		// Dynamite Cop  (PAL)
+		{ "MK-51013",   nullptr,    { 0x4FCBC0, 0 }, { 0x43700000 } },		// Dynamite Cop  (USA)
+		// Draconus: Cult of the Wyrm (USA)
+		// Code 1-2 increases drawing distance
+		{ "T40203N",    nullptr,    { 0x49D7F4, 0x49D8CC, 0x49D6F8, 0 }, { 0x3F07C3BB, 0x447A0000, 0x3FAAAAAB } },
+		// Ecco the Dolphin: Defender of the Future (PAL)
+		{ "MK-5103350", nullptr,    { 0x275418, 0x040E68, 0x040D1C, 0 }, { 0x49D9A5DA, 0x3F100000, 0x3F100000 } },
+		{ "T17705D 05", nullptr,    { 0x304870, 0 }, { 0x3F400000 } },		// Evolution - The World of Sacred Device (PAL)
+		{ "T45005D 50", nullptr,    { 0x36CE5C, 0x36CE8C, 0 }, { 0x43F00000, 0x3F400000 } },	// Evolution 2 - Far Off Promise (PAL)
+		{ "T1711N",     nullptr,    { 0x36C76C, 0x36C73C, 0 }, { 0x3F400000, 0x43F00000 } },	// Evolution 2 - Far Off Promise (USA)
+		{ "T8118D  50", nullptr,    { 0x2C6B7C, 0 }, { 0x00004000 } },		// Ferrari F355 Challenge (PAL) vga mode only
+		{ "HDR-0100",   nullptr,    { 0x3235D4, 0 }, { 0x00004000 } },		// Ferrari F355 Challenge (JP) vga mode only
+		{ "MK-5115450", nullptr,    { 0x3D3B10, 0 }, { 0x43700000 } },		// Fighting Vipers 2 (PAL)
+		{ "HDR-0133",   nullptr,    { 0x3D3AF0, 0 }, { 0x43700000 } },		// Fighting Vipers 2 (JP)
+		{ "MK-51114",   nullptr,    { 0x132DD8, 0xA26CA8, 0xA26738, 0xA275B8, 0xA26AD8, 0xA26908, 0 },
+				{ 0x3F400000, 0x3F400000, 0x3F400000, 0x3F400000, 0x3F400000, 0x3F400000 } },	// Floigan Bros. Ep. 1 (PAL)
+		{ "T34201M",    nullptr,    { 0x586290, 0x586260, 0 }, { 0x3F400000, 0x43F00000 } },	// Frame Gride (JP)
+		{ "T-8113D-50", nullptr,    { 0x55A354, 0 }, { 0x3FAAAAAB } },		// Fur Fighters (PAL)
+		{ "T-8107N",    nullptr,    { 0x55A374, 0 }, { 0x3FAAAAAB } },		// Fur Fighters (USA)
+		{ "T9707D  50", nullptr,    { 0x2E7CD0, 0x2E7D04, 0x2E7D10, 0x2E7D0C, 0 },
+				{ 0x43BEAE39, 0x3DCCCCCD , 0x44A00000, 0xC4200000 } },		// Gauntlet Legends (PAL)
+		{ "HDR-0004",   nullptr,    { 0x364A64, 0 }, { 0x43BA0000 } },		// Godzilla Generations (JP)
+		{ "HDR-0047",   nullptr,    { 0x7C3F24, 0x7C3F54, 0 }, { 0x43F00000, 0x3F400000 } },	// Godzilla Generations Maximum Impact (JP)
+		{ "T41501M",    nullptr,    { 0x282604, 0x282634, 0 }, { 0x43F00000, 0x3F400000 } },	// Golem no Maigo (aka The Lost Golem) (JP)
+		{ "T1219M",     nullptr,    { 0xBC3C94, 0 }, { 0x440A7C9A } },		// Gun Spike (JP)
+		{ "T13301N",    nullptr,    { 0x88E780, 0 }, { 0x3F400000 } },		// Gundam Side Story (USA)
+//		{ "T11001N",    nullptr,    { 0xC3D6BC, 0xD204A8, 0xD32FC8, 0xC7CF84, 0xD20548, 0 },
+//				{ 0x00363031, 0x00000356, 0x00000280, 0x00000280, 0x00000280 } },		// Half-Life. Not working
+		{ "MK-5104150", nullptr,    { 0x23FCC4, 0 }, { 0x44558000 } },		// Headhunter (PAL)
+		{ "MK-5100250", nullptr,    { 0x4C6708, 0 }, { 0x43700000 } },		// House of the Dead 2, The (PAL)
+		{ "MK-51002",   nullptr,    { 0x4C6088, 0 }, { 0x43700000 } },		// House of the Dead 2, The (USA)
+		{ "T38706M",    nullptr,    { 0xC0CFA0, 0 }, { 0x3F400000 } },		// Ikaruga (JP)
+		{ "T46001N",    nullptr,    { 0x1C8A98, 0 }, { 0x3F400000 } },		// Illbleed (USA)
+		{ "T44904D 50", nullptr,    { 0x18C15C, 0x18C18C, 0 }, { 0x43F00000, 0x3F400000 } },	// Iron Aces (PAL)
+		{ "MK-51058",   nullptr,    { 0x32E0FC, 0x32E12C, 0 }, { 0x43F00000, 0x3F400000 } },	// Jet Grind Radio (USA)
+		{ "MK-5105850", nullptr,    { 0x32F9EC, 0x32F9BC, 0 }, { 0x3F400000, 0x43F00000 } },	// Jet Set Radio (PAL)
+		{ "HDR-0078",   nullptr,    { 0x327A8C, 0x327A5C, 0 }, { 0x3F400000, 0x43F00000 } },	// Jet Set Radio (De La) (JP)
+		{ "T22902D 50", nullptr,    { 0x278508, 0 }, { 0x43700000 } },		// Kao The Kangaroo (PAL)
+		{ "T22903N",    nullptr,    { 0x2780A8, 0 }, { 0x43700000 } },		// Kao The Kangaroo (USA)
+		{ "T47803M",    nullptr,    { 0x0FDFAC, 0 }, { 0x3F400000 } },		// Karous (JP)
+//		{ "T41901N",    nullptr,    { 0x53F580, 0xEFB748, 0xEFB750, 0 }, { 0xC4200000, 0x43A00000, 0x43200000 } },	// KISS Psycho Circus – The Nightmare Child (USA)
+		{ "T2501M",     nullptr,    { 0x24A878, 0x24A8A8, 0 }, { 0x43F00000, 0x3F400000 } },	// Langrisser Millenium (JP)
+		{ "T15111D 50", nullptr,    { 0x29B90C, 0 }, { 0x3F400000 } },		// Le Mans 24 Hours (PAL)
+		{ "T15116N",    nullptr,    { 0x2198EC, 0 }, { 0x3F400000 } },		// Looney Tunes: Space Race (USA)
+		{ "MK-5105050", nullptr,    { 0x33818C, 0 }, { 0x3FA66666 } },		// Maken X (PAL)
+		{ "MK-51050",   nullptr,    { 0x30CB4C, 0 }, { 0x3F400000 } },		// Maken X (USA)
+		{ "T1212N",     nullptr,    { 0x2D6B18, 0x268390, 0x268ED8, 0x268934, 0x26947C, 0x269A20, 0x269FC4, 0 },
+				{ 0x43700000, 0x3F400000, 0x3F400000, 0x3F400000, 0x3F400000, 0x3F400000, 0x3F400000 } },		// Marvel vs. Capcom 2 (USA)
+		{ "T1215M",     nullptr,    { 0x2FE2C0, 0x28FB38, 0x290680, 0x2900DC, 0x290C24, 0x2911C8, 0x29176C, 0 },
+				{ 0x43700000, 0x3F400000, 0x3F400000, 0x3F400000, 0x3F400000, 0x3F400000, 0x3F400000 } },		// Marvel vs. Capcom 2 (JP)
+		{ "T41402N",    nullptr,    { 0x551B80, 0 }, { 0x3F400000 } },		// Max Steel - Covert Missions (USA)
+		{ "MK-5102250", "V1.001",   { 0x107FDC, 0x11253C, 0 }, { 0x3F99999A, 0x3F900000 } },	// Metropolis Street Racer (v1.001) (PAL)
+		{ "MK-5102250", "V1.009",   { 0x106B5C, 0x1111F4, 0 }, { 0x3F99999A, 0x3F900000 } },	// Metropolis Street Racer (v1.009) (PAL)
+		{ "MK-51012",   nullptr,    { 0x10A01C, 0x1146FC, 0 }, { 0x3F99999A, 0x3F900000 } },	// Metropolis Street Racer (USA)
+		{ "T0000M",     nullptr,    { 0x1CAEAC, 0x1CAEDC, 0 }, { 0x43F00000, 0x3F400000 } },	// Millenium Racer Y2K Fighters
+		{ "T1221M",     nullptr,    { 0x426B74, 0 }, { 0x43F00000 } },		// Moero! Justice Gauken (JP)
+		{ "T9701D",     nullptr,    { 0x31290C, 0 }, { 0x3F400000 } },		// Mortal Kombat Gold (PAL)
+		{ "T-9701N",    nullptr,    { 0x337B8C, 0 }, { 0x3FA66666 } },		// Mortal Kombat Gold (USA)
+		{ "T7020D",     nullptr,    { 0x1A5D40, 0x1A5D18, 0x1A5D38, 0x1A5D34, 0x1A5D30, 0x1A5D3C, 0x1A5D0C, 0x1A5D08, 0x1ACB78, 0 },
+				{ 0x3F59999A, 0x44084000, 0x3FB1EB85, 0x3FAAAAAB, 0x3F800000, 0x3FA66666, 0xC31B0000, 0x42700000, 0x44160000 } },		// Mr Driller (PAL)
+		{ "T7604M",     nullptr,    { 0x43BDA4, 0x43BDD8, 0x4319E8, 0x431A08, 0x431A28, 0x431A48, 0 },
+				{ 0x43700000, 0x3F9AF5C2, 0x42200000, 0x42200000, 0x438C0000, 0x438C0000 } },	// Nanatsu no Hikan - Senritsu no Bishou (JP)
+		{ "HDR-0079",   nullptr,    { 0x353744, 0x353774, 0x353778, 0 },
+				{ 0x43F00000, 0x3F400000, 0x3F800000 } },					// Napple Tale: Arsia in Daydream (JP)
+//crash		{ "MK-51178",   nullptr,    { 0x23AF00, 0x23B160, 0x144D40, 0x2105B4, 0x705B40, 0 },
+//				{ 0xBFAAAAAB, 0xBFAAAAAB, 0xBFAAAAAB, 0xBFAAAAAB, 0x44558000 } },	// NBA 2K2
+		{ "T9504M",     nullptr,    { 0xCDE848, 0xCDE844, 0 }, { 0x3F400000, 0x3FA00000 } },	// Nightmare Creatures II (USA)
+		{ "T-9502D-50", nullptr,    { 0xBDE9B0, 0xBDE9C4, 0 }, { 0x3F400000, 0x3FA00000 } },	// Nightmare Creatures II (PAL)
+		{ "MK-5110250", nullptr,    { 0x87B5A4, 0 }, { 0x43700000 } },		// Outtrigger (PAL)
+		{ "HDR-0118",   nullptr,    { 0x83E284, 0 }, { 0x43700000 } },		// Outtrigger (JP)
+		{ "T15103D 50", nullptr,    { 0x1EEE78, 0 }, { 0x3F400000 } },		// PenPen (PAL)
+		{ "T17001M",    nullptr,    { 0x1C3828, 0 }, { 0x3F400000 } },		// PenPen TriIcelon (JP)
+		{ "MK-5110050", nullptr,    { 0x548E04, 0x0923C0, 0 }, { 0x43E80000, 0x3F966666 } },	// Phantasy Star Online (PAL) TODO
+		{ "MK-51100",   nullptr,    { 0x548E84, 0x0925A4, 0 }, { 0x43D20000, 0x3FA66666 } },	// Phantasy Star Online (USA) TODO
+		{ "HDR-0129",   nullptr,    { 0x57E344, 0x091794, 0 }, { 0x43D20000, 0x3FA66666 } },	// Phantasy Star Online (JP) TODO
+		{ "MK-5119350", nullptr,    { 0x57552C, 0x0A2DD4, 0 }, { 0x43F00000, 0x3F911111 } },	// Phantasy Star Online Ver. 2 (PAL) TODO
+		{ "MK-51193",   nullptr,    { 0x0A3138, 0x58C8CC, 0 }, { 0x3F911111, 0x43F00000 } },	// Phantasy Star Online Ver. 2 (USA) TODO
+		{ "T1207N",     nullptr,    { 0x7D463C, 0 }, { 0x3F400000 } },		// Plasma Sword - Nightmare of Bilstein (USA)
+		{ "T36801D 50", nullptr,    { 0x7FD3C8, 0 }, { 0x43700000 } },		// Power Stone (PAL)
+		{ "T1201N",     nullptr,    { 0x7FCEE8, 0 }, { 0x43700000 } },		// Power Stone (USA)
+		{ "T36812D 50", nullptr,    { 0x868BA8, 0 }, { 0x43700000 } },		// Power Stone 2 (PAL)
+		{ "T1211N",     nullptr,    { 0x8689A8, 0 }, { 0x43700000 } },		// Power Stone 2 (USA)
+		{ "T1218M",     nullptr,    { 0x849AA0, 0 }, { 0x43700000 } },		// Power Stone 2 (JP)
+		{ "T7022D  50", nullptr,    { 0x33414C, 0 }, { 0x43F00000 } },		// Project Justice (PAL)
+		{ "T1219N",     nullptr,    { 0x33374C, 0 }, { 0x43F00000 } },		// Project Justice (USA)
+		{ "MK-51162",   nullptr,    { 0x204308, 0 }, { 0x3FE38E39 } },		// Propeller Arena
+		{ "T-8106D-50", nullptr,    { 0x7DA39C, 0 }, { 0x3F400000 } },		// Psychic Force 2012 (PAL)
+		{ "T9901M",     nullptr,    { 0x1AD848, 0 }, { 0x3F400000 } },		// Rainbow Cotton (JP)
+		{ "T9711D  50", nullptr,    { 0x1574D8, 0 }, { 0x43700000 } },		// Ready 2 Rumble Boxing Round 2 (PAL)
+		{ "T7012D  05", nullptr,    { 0x4FF93C, 0x4FF96C, 0 }, { 0x43F00000, 0x3F400000 } },	// Record of Lodoss War (En) (PAL)
+		{ "xxxxxxxxxx", nullptr,    { 0x4FF25C, 0x4FF28C, 0 }, { 0x43F00000, 0x3F400000 } },	// Record of Lodoss War (De) (PAL)
+		{ "T7012D  09", nullptr,    { 0x50499C, 0x5049CC, 0 }, { 0x43F00000, 0x3F400000 } },	// Record of Lodoss War (Fr) (PAL)
+		{ "MK-5102151", nullptr,    { 0x3511A0, 0 }, { 0x3FC58577 } },		// Red Dog (PAL)
+		{ "HDR-0074",   nullptr,    { 0x1FF60C, 0x1FF610, 0x1FF5DC, 0 }, { 0x3F400000, 0x3F800000, 0x43DC0000 } },	//Rent a Hero n°1
+		// Resident Evil: Code Veronica (De) (PAL)
+		// Code 1-4 removes the black bars on top and bottom in FMV
+		{ "xxxxxxxxxx", nullptr,    { 0x32A380, 0x383E18, 0x383E38, 0x383E58, 0x383E78, 0 },
+				{ 0x3F400000, 0x43F00000, 0, 0x43F00000, 0 } },
+		// Resident Evil: Code Veronica (Fr) (PAL)
+		// Code 1-4 removes the black bars on top and bottom in FMV
+		{ "T36806D 09", nullptr,    { 0x32A380, 0x383E18, 0x383E38, 0x383E58, 0x383E78, 0 },
+				{ 0x3F400000, 0x43F00000, 0, 0x43F00000, 0 } },
+		// Resident Evil: Code Veronica (Sp) (PAL)
+		{ "xxxxxxxxxx", nullptr,    { 0x32A3A0, /* 0x383E18, 0x383E38, 0x383E58, 0x383E78, */ 0 },
+				{ 0x3F400000, 0x43F00000, 0, 0x43F00000, 0 } },
+		// Resident Evil: Code Veronica (USA)
+		// Code 1-4 removes the black bars on top and bottom in FMV
+		{ "T1204N",     nullptr,    { 0x329E40, 0x3838D8, 0x3838F8, 0x383918, 0x383938, 0 },
+				{ 0x3F400000, 0x43F00000, 0, 0x43F00000, 0 } },
+		{ "T8107D  50", nullptr,    { 0x0464FC, 0x046210, 0 }, { 0x3A888889, 0x44200000 } },	// Re-Volt (PAL) Code 1 is a render fix
+		{ "MK-5119250", nullptr,    { 0x0C5EB4, 0 }, { 0x3A888889 } },		// Rez (PAL)
+		{ "T15122N",    nullptr,    { 0x8E7A80, 0x8E7AB4, 0 }, { 0x43E10000, 0x3FAAAAAB } },	// Ring, The - Terror's Realm (USA)
+		{ "MK-51010",   nullptr,    { 0x1A4D2C, 0x1A4D5C, 0 }, { 0x43F00000, 0x3F400000 } },	// Rippin' Riders (USA)
+		{ "HDR-0044",   nullptr,    { 0x298A94, 0x298AC4, 0 }, { 0x43F00000, 0x3F400000 } },	// Roommania #203 (JP)
+		{ "MK-5109250", nullptr,    { 0x29E6C4, 0 }, { 0x3F400000 } },		// Samba De Amigo (PAL)
+		{ "T41301N",    nullptr,    { 0x77A178, 0 }, { 0x3F400000 } },		// Seventh Cross Evolution (USA)
+		{ "T8104D  58", nullptr,    { 0x2C03F8, 0 }, { 0x44558000 } },		// Shadow Man (PAL)
+		{ "T-8106N",    nullptr,    { 0x2C03F4, 0 }, { 0x3F400000 } },		// Shadow Man (USA)
+		{ "MK-51048",   nullptr,    { 0x4AA4DC, 0x2B4E30, 0 }, { 0x3F400000, 0x3F400000 } },	// Seaman (USA)
+		{ "MK-5105350", nullptr,    { 0x5D613C, 0 }, { 0x3F400000 } },		// Sega GT (PAL)
+		{ "MK-51096",   nullptr,    { 0x495050, 0 }, { 0x43700000 } },		// Sega Marine Fishing (USA)
+//		{ "MK-51019",   nullptr,    { 0xB83A48, 0 }, { 0x3F400000 } },		// Sega Rally 2 (USA) not working?
+//		{ "HDR0010",    nullptr,    { 0xBD9BA0, 0 }, { 0x3F400000 } },		// Sega Rally 2 (JP) not working?
+		{ "HDR-0151",   nullptr,    { 0xAF57DC, 0xAF580C, 0x2122A0, 0 },
+				{ 0x43F00000, 0x3F400000, 0x3F400000 } },					// SGGG – Segagaga (JP)
+		{ "MK-5105950", nullptr,    { 0x231EF8, 0x1EF370, 0 }, { 0x43800000, 0x7C1EF400 } },	// Shenmue (PAL) code 1 reduces clipping
+		{ "MK-51059",   nullptr,    { 0x230250, 0 }, { 0x43800000 } },		// Shenmue (USA) Clipping
+		{ "HDR-0016",   nullptr,    { 0x22E8A0, 0x1EBE70, 0 }, { 0x43800000, 0x7C1EBF00 } },	// Shenmue (JP) code 1 reduces clipping
+		{ "MK-5118450", nullptr,    { 0x31186C, 0 }, { 0x43800000 } },		// Shenmue II (PAL) 01160FF4 0000E100 for black bars in cutscenes
+		// Shenmue II (PAL) Alternative code without clipping or black bars. Might be demanding on real hardware.
+		// 02311880 C3A00000, 0227E198 35AA359E, 01160FF4 0000E100
+		{ "HDR-0164",   nullptr,    { 0x30D67C, 0 }, { 0x43700000 } },		// Shenmue II (JP) Clipping
+		{ "T9505D",     nullptr,    { 0xD1FB14, 0x096A4C, 0 }, { 0x3F400000, 0x3FAAAAAB } },	// Silent Scope (PAL) Choose 60Hz in game options
+		{ "MK-51052",   "  E     ", { 0x502A84, 0 }, { 0x3F400000 } },		// Skies of Arcadia (PAL)
+		{ "MK-51052",   " U      ", { 0x599158, 0 }, { 0x3F400000 } },		// Skies of Arcadia (USA)
+		{ "T15104D 50", nullptr,    { 0x17EF68, 0 }, { 0x43F00010 } },		// Slave Zero (PAL) Widescreen, but a bit zoomed in
+		{ "MK-5101050", nullptr,    { 0x1A50EC, 0x1A511C, 0 }, { 0x43F00000, 0x3F400000 } },	// Snow Surfers (PAL)
+		{ "MK-5100050", nullptr,    { 0x88F528, 0x88F55C, 0 }, { 0x43F00000, 0x3FA66666 } },	// Sonic Adventure (PAL)
+		{ "MK-51000",   nullptr,    { 0x88F5E8, 0x88F61C, 0 }, { 0x43F00000, 0x3FAAAAAB } },	// Sonic Adventure (USA)
+		{ "MK-51117",   nullptr,    { 0x28DEF8, 0x28DF28, 0 }, { 0x43F00000, 0x3f400000 } },	// Sonic Adventure 2 (USA)
+		{ "HDR-0165",   nullptr,    { 0x28DF28, 0x28DEF8, 0 }, { 0x3F400000, 0x43F00000 } },	// Sonic Adventure 2 (JP)
+		{ "MK-51060",   nullptr,    { 0x112A2C, 0 }, { 0x3F400000 } },		// Sonic Shuffle (US)
+		{ "MK-5106050", nullptr,    { 0x110B4C, 0 }, { 0x3F400000 } },		// Sonic Shuffle (PAL)
+		{ "T9103M",     nullptr,    { 0x25C714, 0x25C744, 0 }, { 0x43F00000, 0x3F400000 } },	// Sorcerian - Shichisei Mahou no Shito
+		{ "T1401D  50", nullptr,    { 0x2D6138, 0 }, { 0x3F400000 } },		// Soul Calibur (PAL)
+		{ "T1401N",     nullptr,    { 0x266C28, 0 }, { 0x3F400000 } },		// Soul Calibur (USA)
+		{ "T36802N",    "  E     ", { 0x129FA0, 0x12A9BC, 0x1C9FDC, 0 },
+				{ 0x3EF55555, 0x3EF55555, 0x000000F0 } },					// Soul Reaver (PAL) Code 2 is a Render Fix
+		{ "HDR-0190",   nullptr,    { 0x14D3E0, 0 }, { 0x3F400000 } },		// Space Channel 5 Part 2 (JP)
+		{ "T1216M",     nullptr, { 0x017C38, 0x17F00, 0 }, { 0x3A99999A, 0x3A99999A } }, // Spawn - In the Demon's Hand v1.003 (JP)
+		{ "T1216N",     nullptr, { 0x017C58, 0x17F20, 0 }, { 0x3A99999A, 0x3A99999A } }, // Spawn - In the Demon's Hand v1.000 (US)
+		{ "T36816D 50", nullptr, { 0x017C78, 0x17F40, 0 }, { 0x3A99999A, 0x3A99999A } }, // Spawn - In the Demon's Hand v1.000 (EU)
+		// Star Wars Episode I Racer (USA)
+		// Code 1-4 removes the black bars on top and bottom in FMV
+		{ "T23001N",    nullptr,    { 0x17AE20, 0x29A96C, 0x29A98C, 0x29A9AC, 0x29A9CC, 0 },
+				{ 0x3F400000, 0x42900000, 0x42900000, 0x43CE0000, 0x43CE0000 } },
+		{ "T40206N",    nullptr,    { 0x43296C, 0 }, { 0x3F400000, 0 } },	// Super Magnetic Neo (US)
+		{ "T40206D 50", nullptr,    { 0x43E34C, 0 }, { 0x3F400000, 0 } },	// Super Magnetic Neo (EU)
+//		{ "T7014D  50", nullptr,    { 0xE2B234, 0 }, { 0x3F800000 } },		// Super Runabout (PAL) doesn't work?
+		{ "T17721D 50", nullptr,    { 0x45CED4, 0 }, { 0x3F400000 } },		// Surf Rocket Racers (PAL) alt: 021EBF40 3F400000
+		{ "T17703D 50", nullptr,    { 0xCD8950, 0 }, { 0x3F111111 } },		// Suzuki Alstare Extreme Racing
+		{ "T36807D 05", nullptr,    { 0x140F74, 0x140FA4, 0 }, { 0x43FA0000, 0x3F400000 } },	// Sword of Bersek (PAL)
+		{ "T-36805N",   nullptr,    { 0x13F1C4, 0x13F194, 0 }, { 0x3F400000, 0x43F00000 } },	// Sword of Bersek (USA)
+		{ "MK-51186",   nullptr,    { 0x4A19B0, 0 }, { 0x43700000 } },		// Tennis 2K2 (USA)
+		{ "T15123N",    nullptr,    { 0x29B7BC, 0 }, { 0x3F400000 } },		// Test Drive Le Mans (USA) doesn't work?
+		{ "T20801M",    nullptr,    { 0x1AAC80, 0x1AACB0, 0 }, { 0x43F00000, 0x3F400000 } },	// Tetris 4D (JP)
+		{ "MK-5101153", nullptr,    { 0x14EFA8, 0x14EFD8, 0 }, { 0x43F00000, 0x3F400000 } },	// Timestalkers (PAL)
+		{ "T7009D50",   nullptr,    { 0x39173C, 0 }, { 0x3F400000 } },		// Tech Romancer (PAL)
+		{ "T35402M",    nullptr,    { 0x315370, 0x3153A0, 0 }, { 0x43F00000, 0x3F400000 } },	// Tokyo Bus Guide (JP) doesn't work?
+		{ "T40201D 50", nullptr,    { 0x1D9F10, 0 }, { 0x3F400000 } },		// Tokyo Highway Challenge (PAL)
+		{ "T40210D 50", nullptr,    { 0x21E4F8, 0 }, { 0x43700000 } },		// Tokyo Highway Challenge 2 (PAL)
+		{ "xxxxxxxxxx", nullptr,    { 0x21DEF8, 0 }, { 0x3F400000 } },		// Tokyo Street Racer 2 (USA)
+//		{ "T36804D05",  nullptr,    { 0xB75E28, 0 }, { 0x3EC00000 } },		// Tomb Raider: The Last Revelation (UK) (PAL) clipping, use hex patch instead
+		{ "T13008D 05", nullptr,    { 0x1D7C20, 0 }, { 0x3FA66666 } },		// Tony Hawk's Pro Skater 2 (PAL)
+		{ "T13006N",    nullptr,    { 0x1D77A0, 0 }, { 0x3FA66666 } },		// Tony Hawk's Pro Skater 2 (USA)
+		{ "MK-5102050", nullptr,    { 0x0D592C, 0 }, { 0x3FD00000 } },		// Toy Commander (PAL)
+		{ "xxxxxxxxxx", nullptr,    { 0x469FCC, 0x469FFC, 0 }, { 0x44700000, 0x3F400000 } },	// Toyota Doricatch Series: Land Cruiser 100/Cygnus
+		{ "MK-5109505", nullptr,    { 0x1B2718, 0 }, { 0x3F400000 } },		// UEFA Dream Soccer (PAL)
+		{ "T40203D 50", nullptr,    { 0x1D74E8, 0x1D7518, 0 }, { 0x43F00000, 0x3F400000 } },	// Ultimate Fighting Championship (PAL)
+		{ "T40204N",    nullptr,    { 0x1A9684, 0 }, { 0x3F400000 } },		// Ultimate Fighting Championship (USA) problems with cam in game
+		{ "T-8110D-50", nullptr,    { 0x0C6B90, 0x0C6B94, 0 }, { 0x43F00000, 0x43870000 } },	// Vanishing Point (PAL)
+//		{ "MK-5109450", nullptr,    { 0x244134, 0x7A73B8, 0x7830D8, 0x7A74B8, 0x783138, 0x7A85A0, 0x6C7928, 0x6C7930, 0x6C7948, 0x6C7950, 0 },
+//crash				{ 0x43F00000, 0x3F9C932E, 0x3F9C932E, 0x3F9C932E, 0x3F9C932E, 0x3F400000, 0, 0, 0, 0 } },	// Virtua Athlete 2K (PAL)
+		{ "MK-5100150", nullptr,    { 0x19D718, 0 }, { 0x43700000 } },		// Virtua Fighter 3 TB (PAL)
+		{ "HDR-0002",   nullptr,    { 0x199FB0, 0 }, { 0x43700000 } },		// Virtua Fighter 3 TB (JP)
+		{ "MK-5105450", nullptr,    { 0x456378, 0 }, { 0x43700000 } },		// Virtua Tennis (v1.001) (PAL)
+		{ "MK-51054",   nullptr,    { 0x450A90, 0 }, { 0x43700000 } },		// Virtua Tennis (USA)
+		{ "MK-5118650", nullptr,    { 0x4A4A20, 0 }, { 0x43700000 } },		// Virtua Tennis 2 (PAL)
+//		{ "T0000",      nullptr,    { 0x3A514C, 0x3A6170, 0 }, { 0x3F400000, 0x00000356 } },	// Volgarr the Viking. Not working
+		{ "xxxxxxxxxx", nullptr,    { 0x20BB68, 0x1ACBD0, 0x1B9ADC, 0 },	// Code 1 reduces clipping.	Code 2 fixes the clock.
+				{ 0x43700000, 0x7C1ACC60, 0x3F400000 } },					// What's Shenmue (JP)
+		{ "T40504D 50", nullptr,    { 0x75281C, 0 }, { 0x3F400000 } },		// Wetrix+ (PAL) not working?
+		{ "MK-51152",   nullptr,    { 0x014E90, 0 }, { 0x43700000 } },		// World Series Baseball 2K2 (USA)
+		{ "T20401M",    nullptr,    { 0x323CB0, 0x1ACBD0, 0x1B9ADC, 0 },	// Code 1 reduces clipping. Code 2 fixes the HUD.
+				{ 0x43700000, 0x1ACC60, 0x3F400000 } },						// Zero Gunner 2 (JP)
+		{ "MK-5103850", nullptr,    { 0x9484E8, 0 }, { 0x43700000 } },		// Zombie Revenge (PAL)
+		{ "MK-51038",   nullptr,    { 0x948058, 0 }, { 0x43700000 } },		// Zombie Revenge (USA)
+		{ "HDR-0026",   nullptr,    { 0x948B18, 0 }, { 0x43700000 } },		// Zombie Revenge (JP)
+		{ "T43301M",    nullptr,    { 0x4B0218, 0 }, { 0x3F400000 } },		// Zusar Vasar (JP)
+
+		{ nullptr },
+};
+const WidescreenCheat CheatManager::naomi_widescreen_cheats[] =
+{
+		{ "KNIGHTS OF VALOUR  THE 7 SPIRITS", nullptr, { 0x475B70, 0x475B40, 0 }, { 0x3F400000, 0x43F00000 } },
+		{ "Dolphin Blue", nullptr, { 0x3F2E2C, 0x3F2190, 0x3F2E6C, 0x3F215C, 0 },
+				{ 0x43B90000, 0x3FAA9FBE, 0x43B90000, 0x43F00000 } },
+		{ "METAL SLUG 6", nullptr, { 0xE93478, 0xE9347C, 0 }, { 0x3F400000, 0x3F8872B0 } },
+		{ "TOY FIGHTER", nullptr, { 0x133E58, 0 }, { 0x43700000 } },
+		{ "LUPIN THE THIRD  -THE SHOOTING-", nullptr, { 0x045490 }, { 0x3F400000 } },
+
+		{ nullptr },
+};
+CheatManager cheatManager;
+
+void CheatManager::loadCheatFile(const std::string& filename)
+{
+#ifndef LIBRETRO
+	FILE* cheatfile = nowide::fopen(filename.c_str(), "r");
+	if (cheatfile == nullptr)
+	{
+		WARN_LOG(COMMON, "Cannot open cheat file '%s'", filename.c_str());
+		return;
+	}
+	cheats.clear();
+	Cheat cheat;
+	int cheatNumber = 0;
+	char buffer[512];
+	while (fgets(buffer, sizeof(buffer), cheatfile) != nullptr)
+	{
+		std::string l = buffer;
+		auto equalPos = l.find('=');
+		if (equalPos == std::string::npos)
+			continue;
+		auto quotePos = l.find('"', equalPos);
+		if (quotePos == std::string::npos)
+			continue;
+		auto quote2Pos = l.find('"', quotePos + 1);
+		if (quote2Pos == std::string::npos)
+			continue;
+		if (l.substr(0, 5) != "cheat" || l[5] < '0' || l[5] > '9')
+			continue;
+		char *p;
+		int number = strtol(&l[5], &p, 10);
+		if (number != cheatNumber && cheat.type != Cheat::Type::disabled)
+		{
+			cheatNumber = number;
+			cheats.push_back(cheat);
+			cheat = Cheat();
+		}
+		std::string param = trim_trailing_ws(l.substr(p - &l[0], equalPos - (p - &l[0])));
+		std::string value = l.substr(quotePos + 1, quote2Pos - quotePos - 1);
+
+		if (param == "_address")
+		{
+			cheat.address = strtol(value.c_str(), nullptr, 10);
+			verify(cheat.address < RAM_SIZE);
+		}
+		else if (param == "_cheat_type")
+			cheat.type = (Cheat::Type)strtol(value.c_str(), nullptr, 10);
+		else if (param == "_desc")
+			cheat.description = value;
+		else if (param == "_memory_search_size")
+			cheat.size = 1 << strtol(value.c_str(), nullptr, 10);
+		else if (param == "_value")
+			cheat.value = strtol(value.c_str(), nullptr, 10);
+		else if (param == "_repeat_count")
+			cheat.repeatCount = strtol(value.c_str(), nullptr, 10);
+		else if (param == "_repeat_add_to_value")
+			cheat.repeatValueIncrement = strtol(value.c_str(), nullptr, 10);
+		else if (param == "_repeat_add_to_address")
+			cheat.repeatAddressIncrement = strtol(value.c_str(), nullptr, 10);
+		else if (param == "_enable")
+			cheat.enabled = value == "true";
+	}
+	std::fclose(cheatfile);
+	if (cheat.type != Cheat::Type::disabled)
+		cheats.push_back(cheat);
+	active = !cheats.empty();
+	INFO_LOG(COMMON, "%d cheats loaded", (int)cheats.size());
+	cfgSaveStr("cheats", gameId, filename);
+#endif
+}
+
+void CheatManager::reset(const std::string& gameId)
+{
+	if (this->gameId != gameId)
+	{
+		cheats.clear();
+		active = false;
+		this->gameId = gameId;
+#ifndef LIBRETRO
+		std::string cheatFile = cfgLoadStr("cheats", gameId, "");
+		if (!cheatFile.empty())
+			loadCheatFile(cheatFile);
+#endif
+	}
+	widescreen_cheat = nullptr;
+	if (!config::WidescreenGameHacks)
+		return;
+	if (settings.platform.system == DC_PLATFORM_DREAMCAST)
+	{
+		for (int i = 0; widescreen_cheats[i].game_id != nullptr; i++)
+		{
+			if (!strcmp(gameId.c_str(), widescreen_cheats[i].game_id)
+					&& (widescreen_cheats[i].area_or_version == nullptr
+							|| !strncmp(ip_meta.area_symbols, widescreen_cheats[i].area_or_version, sizeof(ip_meta.area_symbols))
+							|| !strncmp(ip_meta.product_version, widescreen_cheats[i].area_or_version, sizeof(ip_meta.product_version))))
+			{
+				widescreen_cheat = &widescreen_cheats[i];
+				NOTICE_LOG(COMMON, "Applying widescreen hack to game %s", gameId.c_str());
+				break;
+			}
+		}
+	}
+	else
+	{
+		for (int i = 0; naomi_widescreen_cheats[i].game_id != nullptr; i++)
+		{
+			if (!strcmp(gameId.c_str(), naomi_widescreen_cheats[i].game_id))
+			{
+				widescreen_cheat = &naomi_widescreen_cheats[i];
+				NOTICE_LOG(COMMON, "Applying widescreen hack to game %s", gameId.c_str());
+				break;
+			}
+		}
+	}
+	if (widescreen_cheat == nullptr)
+		return;
+	for (size_t i = 0; i < ARRAY_SIZE(widescreen_cheat->addresses) && widescreen_cheat->addresses[i] != 0; i++)
+		verify(widescreen_cheat->addresses[i] < RAM_SIZE);
+}
+
+u32 CheatManager::readRam(u32 addr, u32 bits)
+{
+	switch (bits)
+	{
+	case 8:
+		return ReadMem8_nommu(0x8C000000 + addr);
+	case 16:
+		return ReadMem16_nommu(0x8C000000 + addr);
+	case 32:
+		return ReadMem32_nommu(0x8C000000 + addr);
+	default:
+		die("invalid size");
+		return 0;
+	}
+}
+
+void CheatManager::writeRam(u32 addr, u32 value, u32 bits)
+{
+	switch (bits)
+	{
+	case 8:
+		WriteMem8_nommu(0x8C000000 + addr, (u8)value);
+		break;
+	case 16:
+		WriteMem16_nommu(0x8C000000 + addr, (u16)value);
+		break;
+	case 32:
+		WriteMem32_nommu(0x8C000000 + addr, value);
+		break;
+	default:
+		die("invalid size");
+		break;
+	}
+}
+
+void CheatManager::apply()
+{
+	if (widescreen_cheat != nullptr)
+	{
+		for (size_t i = 0; i < ARRAY_SIZE(widescreen_cheat->addresses) && widescreen_cheat->addresses[i] != 0; i++)
+			writeRam(widescreen_cheat->addresses[i], widescreen_cheat->values[i], 32);
+	}
+	if (active && !networkStarted())
+	{
+		bool skipCheat = false;
+		for (const Cheat& cheat : cheats)
+		{
+			if (skipCheat) {
+				skipCheat = false;
+				continue;
+			}
+			if (!cheat.enabled)
+				continue;
+
+			bool setValue = false;
+			u32 valueToSet = 0;
+			switch (cheat.type)
+			{
+			case Cheat::Type::disabled:
+			default:
+				break;
+			case Cheat::Type::setValue:
+				setValue = true;
+				valueToSet = cheat.value;
+				break;
+			case Cheat::Type::increase:
+				setValue = true;
+				valueToSet = readRam(cheat.address, cheat.size) + cheat.value;
+				break;
+			case Cheat::Type::decrease:
+				setValue = true;
+				valueToSet = readRam(cheat.address, cheat.size) - cheat.value;
+				break;
+			case Cheat::Type::runNextIfEq:
+				skipCheat = readRam(cheat.address, cheat.size) != cheat.value;
+				break;
+			case Cheat::Type::runNextIfNeq:
+				skipCheat = readRam(cheat.address, cheat.size) == cheat.value;
+				break;
+			case Cheat::Type::runNextIfGt:
+				skipCheat = readRam(cheat.address, cheat.size) <= cheat.value;
+				break;
+			case Cheat::Type::runNextIfLt:
+				skipCheat = readRam(cheat.address, cheat.size) >= cheat.value;
+				break;
+			}
+			if (setValue)
+			{
+				u32 address = cheat.address;
+				for (u32 repeat = 0; repeat < cheat.repeatCount; repeat++)
+				{
+					writeRam(address, valueToSet, cheat.size);
+					address += cheat.repeatAddressIncrement * cheat.size / 8;
+					valueToSet += cheat.repeatValueIncrement;
+				}
+			}
+		}
+	}
+}
@@ -0,0 +1,80 @@
+/*
+    Created on: Sep 23, 2019
+
+	Copyright 2019 flyinghead
+
+	This file is part of Flycast.
+
+    Flycast is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Flycast is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "types.h"
+
+struct WidescreenCheat
+{
+	const char *game_id;
+	const char *area_or_version;
+	u32 addresses[16];
+	u32 values[16];
+};
+
+struct Cheat
+{
+	enum class Type {
+		disabled,
+		setValue,
+		increase,
+		decrease,
+		runNextIfEq,
+		runNextIfNeq,
+		runNextIfGt,
+		runNextIfLt
+	};
+	Type type = Type::disabled;
+	std::string description;
+	bool enabled = false;
+	u32 size = 0;
+	u32 address = 0;
+	u32 value = 0;
+	u32 repeatCount = 1;
+	u32 repeatValueIncrement = 0;
+	u32 repeatAddressIncrement = 0;
+};
+
+class CheatManager
+{
+public:
+	void reset(const std::string& gameId);
+	void apply();
+	size_t cheatCount() const { return cheats.size(); }
+	const std::string& cheatDescription(size_t index) const { return cheats[index].description; }
+	bool cheatEnabled(size_t index) const { return cheats[index].enabled; }
+	void enableCheat(size_t index, bool enabled) { cheats[index].enabled = enabled; }
+	void loadCheatFile(const std::string& filename);
+	// Returns true if using 16:9 anamorphic screen ratio
+	bool isWidescreen() const { return widescreen_cheat != nullptr; }
+
+private:
+	u32 readRam(u32 addr, u32 bits);
+	void writeRam(u32 addr, u32 value, u32 bits);
+
+	static const WidescreenCheat widescreen_cheats[];
+	static const WidescreenCheat naomi_widescreen_cheats[];
+	const WidescreenCheat *widescreen_cheat = nullptr;
+	bool active = false;
+	std::vector<Cheat> cheats;
+	std::string gameId;
+};
+
+extern CheatManager cheatManager;
@@ -1,58 +0,0 @@
-#LOCAL_PATH:= 
-
-#MFLAGS	:= -marm -march=armv7-a -mtune=cortex-a8 -mfpu=vfpv3-d16 -mfloat-abi=softfp
-#ASFLAGS	:= -march=armv7-a -mfpu=vfp-d16 -mfloat-abi=softfp
-#LDFLAGS	:= -g -Wl,-Map,$(notdir $@).map,--gc-sections -Wl,-O3 -Wl,--sort-common 
-
-RZDCY_SRC_DIR ?= $(call my-dir)
-
-RZDCY_MODULES	:=	cfg/ hw/arm7/ hw/aica/ hw/holly/ hw/ hw/gdrom/ hw/maple/ \
- hw/mem/ hw/pvr/ hw/sh4/ hw/sh4/interpr/ hw/sh4/modules/ plugins/ profiler/ oslib/ \
- hw/extdev/ hw/arm/ imgread/ linux/ ./ deps/zlib/ deps/chdr/ deps/crypto/ deps/libelf/ deps/chdpsr/ arm_emitter/ \
- deps/libzip/ deps/libpng/ rend/
-
-ifndef NO_REC
-	RZDCY_MODULES += hw/sh4/dyna/
-endif
-
-ifndef NOT_ARM
-    RZDCY_MODULES += rec-ARM/
-endif
-
-ifndef NO_REND
-    RZDCY_MODULES += rend/gles/
-else
-    RZDCY_MODULES += rend/norend/
-endif
-
-ifdef FOR_ANDROID
-    RZDCY_MODULES += android/ deps/libandroid/
-endif
-
-ifdef FOR_LINUX
-	ifdef USE_SDL
-		RZDCY_MODULES += sdl/
-	else
-		RZDCY_MODULES += linux-dist/
-	endif
-endif
-
-RZDCY_FILES := $(foreach dir,$(addprefix $(RZDCY_SRC_DIR)/,$(RZDCY_MODULES)),$(wildcard $(dir)*.cpp))
-RZDCY_FILES += $(foreach dir,$(addprefix $(RZDCY_SRC_DIR)/,$(RZDCY_MODULES)),$(wildcard $(dir)*.c))
-RZDCY_FILES += $(foreach dir,$(addprefix $(RZDCY_SRC_DIR)/,$(RZDCY_MODULES)),$(wildcard $(dir)*.S))
-	
-ifdef FOR_PANDORA
-RZDCY_CXXFLAGS	:= \
-	$(CFLAGS) -c -g -O3 -I$(RZDCY_SRC_DIR) -I$(RZDCY_SRC_DIR)/deps \
-	-DRELEASE -DPANDORA\
-	-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp \
-	-frename-registers -fsingle-precision-constant -ffast-math \
-	-ftree-vectorize -fomit-frame-pointer -fno-exceptions -fno-rtti -std=gnu++11
-else
-RZDCY_CXXFLAGS	:= \
-	$(CFLAGS) -c -g -O3 -I$(RZDCY_SRC_DIR) -I$(RZDCY_SRC_DIR)/deps \
-	-D_ANDROID -DRELEASE -DTARGET_BEAGLE\
-	-march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16 \
-	-frename-registers -fsingle-precision-constant -ffast-math \
-	-ftree-vectorize -fomit-frame-pointer -fno-exceptions -fno-rtti -std=gnu++11
-endif
@@ -0,0 +1,324 @@
+/*
+	Copyright 2021 flyinghead
+
+	This file is part of Flycast.
+
+    Flycast is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Flycast is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "types.h"
+#include "emulator.h"
+#include "hw/sh4/sh4_if.h"
+#include "hw/sh4/sh4_mem.h"
+#include "hw/sh4/sh4_interpreter.h"
+#include "cfg/option.h"
+#include <array>
+#include <signal.h>
+#include <map>
+
+#ifndef SIGTRAP
+#define SIGTRAP 5
+#endif
+#ifndef SIGBUS
+#define SIGBUS 7
+#endif
+
+const std::array<Sh4RegType, 59> Sh4RegList {
+		reg_r0,
+		reg_r1,
+		reg_r2,
+		reg_r3,
+		reg_r4,
+		reg_r5,
+		reg_r6,
+		reg_r7,
+		reg_r8,
+		reg_r9,
+		reg_r10,
+		reg_r11,
+		reg_r12,
+		reg_r13,
+		reg_r14,
+		reg_r15,
+		reg_nextpc,
+		reg_pr,
+		reg_gbr,
+		reg_vbr,
+		reg_mach,
+		reg_macl,
+		reg_sr_status,
+
+		reg_fpul,
+		reg_fpscr,
+		reg_fr_0, reg_fr_1, reg_fr_2, reg_fr_3, reg_fr_4, reg_fr_5, reg_fr_6, reg_fr_7,
+		reg_fr_8, reg_fr_9, reg_fr_10, reg_fr_11, reg_fr_12, reg_fr_13, reg_fr_14, reg_fr_15,
+		reg_ssr,
+		reg_spc,
+		// correct?
+		reg_r0, reg_r1, reg_r2, reg_r3, reg_r4, reg_r5, reg_r6, reg_r7,
+		reg_r0_Bank, reg_r1_Bank, reg_r2_Bank, reg_r3_Bank, reg_r4_Bank, reg_r5_Bank, reg_r6_Bank, reg_r7_Bank,
+};
+
+class DebugAgent
+{
+public:
+	void doContinue(u32 pc = 1)
+	{
+		if (pc != 1)
+			Sh4cntx.pc = pc;
+		dc_resume();
+	}
+
+	void step()
+	{
+		bool restoreBreakpoint = removeMatchpoint(0, Sh4cntx.pc, 2);
+		u32 savedPc = Sh4cntx.pc;
+		dc_step();
+		if (restoreBreakpoint)
+			insertMatchpoint(0, savedPc, 2);
+	}
+
+	int readAllRegs(u32 **regs)
+	{
+		static std::array<u32, Sh4RegList.size()> allregs;
+		for (u32 i = 0; i < Sh4RegList.size(); i++)
+		{
+			if (Sh4RegList[i] == reg_sr_status)
+				allregs[i] = sh4_sr_GetFull();
+			else if (Sh4RegList[i] != NoReg)
+				allregs[i] = *GetRegPtr(Sh4RegList[i]);
+		}
+		*regs = &allregs[0];
+		return allregs.size();
+	}
+
+	void writeAllRegs(const std::vector<u32>& regs)
+	{
+		for (u32 i = 0; i < Sh4RegList.size(); i++)
+			if (Sh4RegList[i] != NoReg)
+				*GetRegPtr(Sh4RegList[i]) = regs[i];
+	}
+
+	u32 readReg(u32 regNum)
+	{
+		if (regNum >= Sh4RegList.size())
+			return 0;
+		Sh4RegType reg = Sh4RegList[regNum];
+		if (reg == reg_sr_status)
+			return sh4_sr_GetFull();
+		if (reg != NoReg)
+			return *GetRegPtr(reg);
+		return 0;
+	}
+	void writeReg(u32 regNum, u32 value)
+	{
+		if (regNum >= Sh4RegList.size())
+			return;
+		Sh4RegType reg = Sh4RegList[regNum];
+		if (reg == reg_sr_status)
+			sh4_sr_SetFull(value);
+		else if (reg != NoReg)
+			*GetRegPtr(reg) = value;
+	}
+
+	const u8 *readMem(u32 addr, u32 len)
+	{
+		static std::vector<u8> data;
+		data.resize(len);
+		u8 *p = &data[0];
+		while (len > 0)
+		{
+			if (len >= 4 && (addr & 3) == 0)
+			{
+				*(u32 *)p = ReadMem32_nommu(addr);
+				addr += 4;
+				len -= 4;
+				p += 4;
+			}
+			else if (len >= 2 && (addr & 1) == 0)
+			{
+				*(u16 *)p = ReadMem16_nommu(addr);
+				addr += 2;
+				len -= 2;
+				p += 2;
+			}
+			else
+			{
+				*p++ = ReadMem8_nommu(addr);
+				addr++;
+				len--;
+			}
+		}
+		return &data[0];
+	}
+	void writeMem(u32 addr, const std::vector<u8>& data)
+	{
+		const u8 *p = &data[0];
+		u32 len = data.size();
+		while (len > 0)
+		{
+			if (len >= 4 && (addr & 3) == 0)
+			{
+				WriteMem32_nommu(addr, *(u32 *)p);
+				addr += 4;
+				len -= 4;
+				p += 4;
+			}
+			else if (len >= 2 && (addr & 3) == 0)
+			{
+				WriteMem16_nommu(addr, *(u16 *)p);
+				addr += 2;
+				len -= 2;
+				p += 2;
+			}
+			else
+			{
+				WriteMem8_nommu(addr, *p++);
+				addr++;
+				len--;
+			}
+		}
+	}
+	bool insertMatchpoint(char type, u32 addr, u32 len)
+	{
+		if (type == 0 && len != 2) {
+			WARN_LOG(COMMON, "insertMatchpoint: length != 2: %d", len);
+			return false;
+		}
+		// TODO other matchpoint types
+		if (breakpoints.find(addr) != breakpoints.end())
+			return true;
+		breakpoints[addr] = Breakpoint(type, addr);
+		breakpoints[addr].savedOp = ReadMem16_nommu(addr);
+		WriteMem16_nommu(addr, 0xC308);	// trapa #0x20
+		return true;
+	}
+	bool removeMatchpoint(char type, u32 addr, u32 len)
+	{
+		if (type == 0 && len != 2) {
+			WARN_LOG(COMMON, "removeMatchpoint: length != 2: %d", len);
+			return false;
+		}
+		auto it = breakpoints.find(addr);
+		if (it == breakpoints.end())
+			return false;
+		WriteMem16_nommu(addr, it->second.savedOp);
+		breakpoints.erase(it);
+		return true;
+	}
+
+	u32 interrupt()
+	{
+		config::DynarecEnabled = false;
+		exception = SIGINT;
+		dc_stop();
+		return exception;
+	}
+
+	// called on the emu thread
+	void debugTrap(u32 event)
+	{
+		exception = findException(event);
+		Sh4cntx.pc -= 2;	// FIXME delay slot
+	}
+
+	void postDebugTrap()
+	{
+		// needed to join the emu thread since debugTrap() is called by it
+		dc_stop();
+	}
+
+	u32 currentException()
+	{
+		return exception;
+	}
+
+	void restart()
+	{
+		dc_stop();
+		dc_reset(true);
+		dc_resume();
+	}
+
+	void detach()
+	{
+		dc_resume();
+	}
+
+	void kill()
+	{
+		dc_exit();
+	}
+
+	void resetAgent()
+	{
+		stack.clear();
+	}
+
+	int findException(u32 event)
+	{
+		switch (event)
+		{
+		case 0x0A0:		// Instruction/data TLB protection violation exception (read)
+		case 0x0C0:		// Data TLB protection violation exception (write)
+			return SIGSEGV;
+		case 0x0E0:		// Instruction/data address error (read)
+		case 0x100:		// data address error (write)
+			return SIGBUS;
+		case 0x160:		// trapa
+		case 0x1E0:		// User break before/after instruction execution
+			return SIGTRAP;
+		case 0x180:		// General illegal instruction exception
+		case 0x1A0:		// Slot illegal instruction exception
+			return SIGILL;
+		case 0x120:		// FPU exception
+		case 0x800:		// General FPU disable exception
+		case 0x820:		// Slot FPU disable exception
+			return SIGFPE;
+		default:
+			return SIGABRT;
+		}
+	}
+
+	const u32 *getStack(u32& size)
+	{
+		verify(!Sh4cntx.CpuRunning);
+		size = stack.size() * 8;
+		return (const u32 *)&stack[0];
+	}
+
+	void subroutineCall()
+	{
+		subroutineReturn();
+		stack.push_back(std::make_pair(Sh4cntx.pc, Sh4cntx.r[15]));
+	}
+
+	void subroutineReturn()
+	{
+		while (!stack.empty() && Sh4cntx.r[15] >= stack.back().second)
+			stack.pop_back();
+	}
+
+	u32 exception = 0;
+
+	struct Breakpoint {
+		Breakpoint() = default;
+		Breakpoint(u16 type, u32 addr) : addr(addr), type(type) { }
+		u32 addr = 0;
+		u16 type = 0;
+		u16 savedOp = 0;
+	};
+	std::map<u32, Breakpoint> breakpoints;
+	std::vector<std::pair<u32, u32>> stack;
+};
@@ -0,0 +1,883 @@
+/*
+	Copyright 2021 flyinghead
+
+	This file is part of Flycast.
+
+    Flycast is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Flycast is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#include "types.h"
+
+#ifdef GDB_SERVER
+#include "gdb_server.h"
+#include "debug_agent.h"
+#include "network/net_platform.h"
+#include <stdexcept>
+#include <thread>
+#include <chrono>
+#include <mutex>
+
+#define SERVER_PORT 3263
+
+namespace debugger {
+
+static void emuEventCallback(Event event);
+
+class GdbServer
+{
+public:
+	struct Error : public std::runtime_error {
+		Error(const char *reason) : std::runtime_error(reason) {}
+	};
+
+	void init()
+	{
+		if (VALID(serverSocket))
+			return;
+
+		serverSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+		if (!VALID(serverSocket))
+			throw Error("gdb: Cannot create server socket");
+
+		int option = 1;
+		setsockopt(serverSocket, SOL_SOCKET, SO_REUSEADDR, (const char *)&option, sizeof(option));
+
+		struct sockaddr_in serveraddr;
+		memset(&serveraddr, 0, sizeof(serveraddr));
+		serveraddr.sin_family = AF_INET;
+		serveraddr.sin_port = htons(SERVER_PORT);
+
+		if (::bind(serverSocket, (struct sockaddr *)&serveraddr, sizeof(serveraddr)) < 0)
+		{
+			closesocket(serverSocket);
+			throw Error("gdb: bind() failed");
+		}
+		if (::listen(serverSocket, 5) < 0)
+		{
+			closesocket(serverSocket);
+			throw Error("gdb: listen() failed");
+		}
+		EventManager::listen(Event::Resume, emuEventCallback);
+		EventManager::listen(Event::Terminate, emuEventCallback);
+	}
+
+	void term()
+	{
+		stop();
+		if (VALID(clientSocket))
+		{
+			closesocket(clientSocket);
+			clientSocket = INVALID_SOCKET;
+		}
+		if (VALID(serverSocket))
+		{
+			closesocket(serverSocket);
+			serverSocket = INVALID_SOCKET;
+		}
+	}
+
+	void run()
+	{
+		DEBUG_LOG(COMMON, "GdbServer starting");
+		thread = std::thread(&GdbServer::serverThread, this);
+	}
+
+	void stop()
+	{
+		if (thread.joinable())
+		{
+			DEBUG_LOG(COMMON, "GdbServer stopping");
+			agent.resetAgent();
+			stopRequested = true;
+			thread.join();
+		}
+	}
+
+	bool isRunning() const {
+		return thread.joinable();
+	}
+
+	// called on the emu thread
+	void debugTrap(u32 event)
+	{
+		if (!attached)
+			return;
+		agent.debugTrap(event);
+		reportException();
+		postDebugTrapNeeded = true;
+		throw Stop();
+	}
+
+private:
+	const u32 EXCEPT_NONE = 1;
+
+	void serverThread()
+	{
+		while (!stopRequested)
+		{
+			fd_set fds;
+			FD_ZERO(&fds);
+			sock_t max_fd = serverSocket;
+			FD_SET(serverSocket, &fds);
+			if (VALID(clientSocket))
+			{
+				max_fd = std::max(max_fd, clientSocket);
+				FD_SET(clientSocket, &fds);
+			}
+			timeval tv;
+			tv.tv_sec = 0;
+			tv.tv_usec = 100 * 1000;
+			if (::select(max_fd + 1, &fds, nullptr, nullptr, &tv) > 0)
+			{
+				if (FD_ISSET(serverSocket, &fds))
+				{
+					try {
+						acceptClientConnection();
+					} catch (const Error& e) {
+						ERROR_LOG(COMMON, "%s", e.what());
+						closesocket(serverSocket);
+						serverSocket = INVALID_SOCKET;
+						break;
+					}
+				}
+				else if (FD_ISSET(clientSocket, &fds))
+				{
+					readCommand();
+				}
+			}
+		}
+		if (VALID(clientSocket))
+		{
+			closesocket(clientSocket);
+			clientSocket = INVALID_SOCKET;
+		}
+		attached = false;
+		stopRequested = false;
+	}
+
+	void acceptClientConnection()
+	{
+		if (VALID(clientSocket))
+			closesocket(clientSocket);
+		sockaddr_in src_addr{};
+		socklen_t addr_len = sizeof(src_addr);
+		clientSocket = ::accept(serverSocket, (sockaddr *)&src_addr, &addr_len);
+		if (!VALID(clientSocket))
+		{
+			if (get_last_error() != L_EAGAIN && get_last_error() != L_EWOULDBLOCK)
+				throw Error("accept failed");
+		}
+		else
+		{
+			NOTICE_LOG(NETWORK, "gdb: client connection");
+			attached = true;
+			agent.interrupt();
+		}
+	}
+
+	void readCommand()
+	{
+		if (postDebugTrapNeeded)
+		{
+			postDebugTrapNeeded = false;
+			agent.postDebugTrap();
+		}
+		try {
+			std::string packet = recvPacket();
+			if (packet.empty())
+				return;
+
+			DEBUG_LOG(NETWORK, "gdb: recv %s", packet.c_str());
+			switch (packet[0])
+			{
+			case '!':	// Enable extended mode
+				sendPacket("OK");
+				break;
+			case '?':	// Sent when connection is first established to query the reason the target halted
+				reportException();
+				break;
+			case 'A':	// Initialized argv[] array passed into program. not supported
+				sendPacket("E01");
+				break;;
+			case 'b':	// Change the serial line speed to baud. deprecated
+				break;
+			case 'B':	// Set or clear a breakpoint at addr. deprecated
+				break;
+			case 'c':	// Continue at addr, which is the address to resume.
+						// If addr is omitted, resume at current address
+				sendContinue(packet);
+				break;
+			case 'C':	// Continue with signal sig
+				sendContinue(packet);
+				break;
+			case 'd':	// Toggle debug flag. deprecated
+				break;
+			case 'D':	// Detach GDB from the remote system
+				sendPacket("OK");
+				agent.detach();
+				break;
+			case 'F':	// File-I/O protocol extension not currently supported
+				break;;
+			case 'g':	// Read general registers
+				readAllRegs();
+				break;
+			case 'G':	// Write general registers
+				writeAllRegs(packet);
+				break;
+			case 'H':	// Set thread for subsequent operations
+				sendPacket("OK");
+				break;
+			case 'i':	// Step the remote target by a single clock cycle
+			case 'I':	// Signal, then cycle step
+				// not supported
+				sendPacket("");
+				break;
+			case 'k':	// Kill request. Stop process/system
+				agent.kill();
+				break;
+			case 'm':	// Read length addressable memory units
+				readMem(packet);
+				break;
+			case 'M':	// Write length addressable memory units
+				writeMem(packet);
+				break;
+			case 'p':	// Read the value of register
+				readReg(packet);
+				break;
+			case 'P':	// Write register
+				writeReg(packet);
+				break;
+			case 'q':	// General query packets
+				query(packet);
+				break;
+			case 'Q':	// General set packets
+				set(packet);
+				break;
+			case 'r':	// Reset the entire system. Deprecated (use 'R' instead)
+				break;
+			case 'R':	// Restart the program being debugged.
+				restart();
+				break;
+			case 's':	// Single step
+				step(EXCEPT_NONE);
+				break;
+			case 'S':	// Step with signal
+				step();
+				break;
+			case 't':	// Search backwards. unsupported
+				break;
+			case 'T':	// Find out if the thread is alive
+				sendPacket("OK");
+				break;
+			case 'v':	// 'v' packets to control execution
+				vpacket(packet);
+				break;
+			case 'X':	// Write binary data to memory
+				writeMemBin(packet);
+				break;
+			case 'z':	// Remove a breakpoint/watchpoint.
+				removeMatchpoint(packet);
+				break;
+			case 'Z':	// Insert a breakpoint/watchpoint.
+				insertMatchpoint(packet);
+				break;
+			case 3:
+				interrupt();
+				break;
+			default:
+				// Unknown commands are ignored
+				WARN_LOG(COMMON, "Unknown gdb command: %s", packet.c_str());
+				break;;
+			}
+		} catch (const Error& e) {
+			ERROR_LOG(COMMON, "%s", e.what());
+			closesocket(clientSocket);
+			clientSocket = INVALID_SOCKET;
+			attached = false;
+		}
+	}
+
+	void reportException()
+	{
+		char s[4];
+		sprintf(s, "S%02X", agent.currentException());
+		sendPacket(s);
+	}
+
+	void sendContinue(const std::string& pkt)
+	{
+		if (pkt[0] != 'c') {
+			WARN_LOG(COMMON, "Continue with signal not supported");
+			return;
+		}
+
+		if (pkt == "c")
+			agent.doContinue();
+		else
+		{
+			// Get the pc at which to resume
+			u32 addr;
+			if (sscanf(pkt.c_str(), "c%x", &addr) != 1)
+			{
+				WARN_LOG(COMMON, "Continue address invalid %s", pkt.c_str());
+				return;
+			}
+			agent.doContinue(addr);
+		}
+	}
+
+	void readAllRegs()
+	{
+		u32 *regs;
+		int c = agent.readAllRegs(&regs);
+		std::string outpkt;
+		for (int i = 0; i < c; i++)
+			outpkt += pack(regs[i]);
+		sendPacket(outpkt);
+	}
+
+	void writeAllRegs(const std::string& pkt)
+	{
+		std::vector<u32> regs;
+		for (auto it = pkt.begin() + 1; it <= pkt.end() - 8; it += 8)
+			regs.push_back(unpack(&*it, 8));
+
+		agent.writeAllRegs(regs);
+		sendPacket("OK");
+	}
+
+	void readMem(const std::string& pkt)
+	{
+		u32 addr;
+		u32 len;
+		if (sscanf(pkt.c_str(), "m%x,%x:", &addr, &len) != 2)
+		{
+			WARN_LOG(COMMON, "readMem: invalid packet %s", pkt.c_str());
+			sendPacket("E01");
+			return;
+		}
+		const u8 *mem = agent.readMem(addr, len);
+		std::string outpkt;
+		for (u32 i = 0; i < len; i++)
+		{
+			char s[3];
+			sprintf(s,"%02x", mem[i]);
+			outpkt += s;
+		}
+		sendPacket(outpkt);
+	}
+
+	void writeMem(const std::string& pkt)
+	{
+		u32 addr;
+		u32 len;
+		if (sscanf(pkt.c_str(), "M%x,%x:", &addr, &len) != 2)
+		{
+			WARN_LOG(COMMON, "writeMem: invalid packet %s", pkt.c_str());
+			sendPacket("E01");
+			return;
+		}
+		std::vector<u8> data(len);
+		const char *p = &pkt[pkt.find(':')] + 1;
+		for (u32 i = 0; i < len; i++, p += 2)
+		{
+			u32 b;
+			sscanf(p,"%2x", &b);
+			data[i] = (u8)b;
+		}
+		agent.writeMem(addr, data);
+		sendPacket("OK");
+	}
+
+	void writeMemBin(const std::string& pkt)
+	{
+		u32 addr;
+		u32 len;
+		if (sscanf(pkt.c_str(), "X%x,%x:", &addr, &len) != 2)
+		{
+			WARN_LOG(COMMON, "writeMemBin invalid command: %s", pkt.c_str());
+			sendPacket("E01");
+			return;
+		}
+		const char *p = &pkt[pkt.find(':')] + 1;
+		std::vector<u8> data;
+		data.reserve(pkt.length() - (p - &pkt[0]));
+		for (; p <= &pkt.back(); p++)
+		{
+			u8 b = *p;
+			if (b == '}')
+			{
+				b = *++p ^ 0x20;
+			}
+			data.push_back(b);
+		}
+		agent.writeMem(addr, data);
+		sendPacket("OK");
+	}
+
+	void readReg(const std::string& pkt)
+	{
+		u32 regNum;
+		if (sscanf(pkt.c_str(), "p%x", &regNum) != 1)
+		{
+			WARN_LOG(COMMON, "readReg: invalid packet %s", pkt.c_str());
+			sendPacket("E01");
+			return;
+		}
+		u32 v = agent.readReg(regNum);
+		sendPacket(pack(v));
+	}
+
+	void writeReg(const std::string& pkt)
+	{
+		u32 regNum;
+		char vstr[9];
+		if (sscanf(pkt.c_str(), "P%x=%8s", &regNum, vstr) != 2)
+		{
+			WARN_LOG(COMMON, "writeReg: invalid packet %s", pkt.c_str());
+			sendPacket("E01");
+			return;
+		}
+		agent.writeReg(regNum, unpack(vstr, 8));
+		sendPacket("OK");
+	}
+
+	void query(const std::string& pkt)
+	{
+		if (pkt == "qC")
+			// Return the current thread ID. 0 is "any thread"
+			sendPacket("QC0.01");
+		else if (pkt.rfind("qCRC", 0) == 0)
+		{
+			WARN_LOG(COMMON, "CRC compute not supported %s", pkt.c_str());
+			sendPacket("E01");
+		}
+		else if (pkt == "qfThreadInfo")
+			// Obtain a list of all active thread IDs (first call)
+			sendPacket("m0");
+		else if (pkt == "qsThreadInfo")
+			// Obtain a list of all active thread IDs (subsequent calls -> 'l' == end of list)
+			sendPacket("l");
+		else if (pkt.rfind("qGetTLSAddr:", 0) == 0)
+			// Fetch the address associated with thread local storage
+			sendPacket("");
+		else if (pkt.rfind("qL", 0) == 0)
+			// Obtain thread information. deprecated
+			sendPacket("qM001");
+		else if (pkt == "qOffsets")
+			// Get section offsets. Not supported
+			sendPacket("");
+		else if (pkt.rfind("qP", 0) == 0)
+			// Returns information on thread. deprecated
+			sendPacket("");
+		else if (pkt.rfind("qRcmd,", 0) == 0)
+		{
+			std::string customCmd;
+			for (const char *p = pkt.c_str() + 6; *p != '\0'; p += 2)
+				customCmd += (char)unpack(p, 2);
+			DEBUG_LOG(COMMON, "query: custom command %s", customCmd.c_str());
+			if (customCmd == "reset")
+				restart();
+			else if (customCmd == "stack")
+			{
+				u32 len;
+				const u32 *data = agent.getStack(len);
+				len /= 4;
+
+				char reply[len * 9 * 2 + 1];
+				char *r = reply;
+				for (u32 i = 0; i < len; i++)
+				{
+					char n[10];
+					sprintf(n, "%08x ", *data++);
+					for (char *p = n; *p != 0; p++)
+					{
+						*r++ = packnb((*p >> 4) & 0xf);
+						*r++ = packnb(*p & 0xf);
+					}
+				}
+				*r = 0;
+				sendPacket(reply);
+			}
+			else
+				sendPacket("");
+		}
+		else if (pkt.rfind("qSupported", 0) == 0)
+			// Tell the remote stub about features supported by GDB,
+			// and query the stub for features it supports
+			sendPacket("PacketSize=10000");
+		else if (pkt.rfind("qSymbol:", 0) == 0)
+			// Notify the target that GDB is prepared to serve symbol lookup requests
+			sendPacket("OK");
+		else if (pkt.rfind("qThreadExtraInfo,", 0) == 0)
+		{
+			// Obtain from the target OS a printable string description of thread attributes
+			char s[19];
+			sprintf(s, "%02x%02x%02x%02x%02x%02x%02x%02x%02x", 'R', 'u', 'n', 'n', 'a', 'b', 'l', 'e', 0);
+			sendPacket(std::string(s, 18));
+		}
+		else if (pkt.rfind("qXfer:", 0) == 0)
+			// Read uninterpreted bytes from the target’s special data area identified by the keyword object
+			sendPacket("");
+		else if (pkt.rfind("qAttached", 0) == 0)
+			// Return an indication of whether the remote server attached to an existing process
+			// or created a new process
+			sendPacket("1");  // existing process
+		else if (pkt.rfind("qTfV", 0) == 0)
+			// request data about trace state variables
+			sendPacket("");
+		else if (pkt.rfind("qTfP", 0) == 0)
+			// request data about tracepoints
+			sendPacket("");
+		else if (pkt.rfind("qTStatus", 0) == 0)
+			// Ask the stub if there is a trace experiment running right now
+			sendPacket("");
+		else
+			WARN_LOG(COMMON, "query not supported %s", pkt.c_str());
+	}
+
+	void set(const std::string& pkt)
+	{
+		if (pkt.rfind("QPassSignals:", 0) == 0)
+			// Passing signals not supported
+			sendPacket("");
+		else if (pkt.rfind("QTDP", 0) == 0
+				|| pkt.rfind("QFrame", 0) == 0
+				|| pkt.rfind("QTStart", 0) == 0
+				|| pkt.rfind("QTStop", 0) == 0
+				|| pkt.rfind("QTinit", 0) == 0
+				|| pkt.rfind("QTro", 0) == 0)
+			// No tracepoint feature supported
+			sendPacket("");
+		else
+			WARN_LOG(COMMON, "set not supported %s", pkt.c_str());
+	}
+
+	void vpacket(const std::string& pkt)
+	{
+		if (pkt.rfind("vAttach;", 0) == 0)
+			sendPacket("S05");
+		else if (pkt.rfind("vCont?", 0) == 0)
+			// not supported
+			sendPacket("vCont;s;c");
+		else if (pkt.rfind("vCont", 0) == 0)
+			// not supported
+			WARN_LOG(COMMON, "vCont not supported %s", pkt.c_str());
+		else if (pkt.rfind("vFile:", 0) == 0)
+			// not supported
+			sendPacket("");
+		else if (pkt.rfind("vFlashErase:", 0) == 0)
+			// not supported
+			sendPacket("E01");
+		else if (pkt.rfind("vFlashWrite:", 0) == 0)
+			// not supported
+			sendPacket("E01");
+		else if (pkt.rfind("vFlashDone:", 0) == 0)
+			// not supported
+			sendPacket("E01");
+		else if (pkt.rfind("vRun;", 0) == 0)
+		{
+			if (pkt != "vRun;")
+				WARN_LOG(COMMON, "unexpected vRun args ignored: %s", pkt.c_str());
+			agent.restart();
+			sendPacket("S05");
+		}
+		else if (pkt.rfind("vKill", 0) == 0)
+		{
+			sendPacket("OK");
+			agent.kill();
+		}
+		else if (pkt.rfind("vMustReplyEmpty", 0) == 0)
+			// Reply empty packet
+			sendPacket("");
+		else
+			WARN_LOG(COMMON, "unknown v packet: %s", pkt.c_str());
+	}
+
+	void restart()
+	{
+		agent.restart();
+	}
+
+	void step(u32 what = 0)
+	{
+		agent.step();
+		sendPacket("S05");
+	}
+
+	void insertMatchpoint(const std::string& pkt)
+	{
+		u32 type;
+		u32 addr;
+		u32 len;
+		if (sscanf(pkt.c_str(), "Z%1d,%x,%1d", &type, &addr, &len) != 3) {
+			WARN_LOG(COMMON, "insertMatchpoint: unknown packet: %s", pkt.c_str());
+			sendPacket("E01");
+		}
+		switch (type) {
+		    case 0:		// soft bp
+		    	if (agent.insertMatchpoint(0, addr, len))
+		    		sendPacket("OK");
+		    	else
+		    		sendPacket("E01");
+		    	break;
+		    case 1:		// hardware bp
+		    	sendPacket("");
+		    	break;
+		    case 2:		// write watchpoint
+		    	sendPacket("");
+		    	break;
+		    case 3:		// read watchpoint
+		    	sendPacket("");
+		    	break;
+		    case 4:		// access watchpoint
+		    	sendPacket("");
+		    	break;
+		    default:
+		    	sendPacket("");
+		    	break;
+		}
+	}
+
+	void removeMatchpoint(const std::string& pkt)
+	{
+		u32 type;
+		u32 addr;
+		u32 len;
+		if (sscanf(pkt.c_str(), "z%1d,%x,%1d", &type, &addr, &len) != 3) {
+			WARN_LOG(COMMON, "removeMatchpoint: unknown packet: %s", pkt.c_str());
+			sendPacket("E01");
+		}
+		switch (type) {
+		    case 0:		// soft bp
+		    	if (agent.removeMatchpoint(0, addr, len))
+		    		sendPacket("OK");
+		    	else
+		    		sendPacket("E01");
+		    	break;
+		    case 1:		// hardware bp
+		    	sendPacket("");
+		    	break;
+		    case 2:		// write watchpoint
+		    	sendPacket("");
+		    	break;
+		    case 3:		// read watchpoint
+		    	sendPacket("");
+		    	break;
+		    case 4:		// access watchpoint
+		    	sendPacket("");
+		    	break;
+		    default:
+		    	sendPacket("");
+		    	break;
+		}
+	}
+
+	void interrupt()
+	{
+		u32 signal = agent.interrupt();
+		char s[10];
+		sprintf(s, "S%02x", signal);
+		sendPacket(s);
+	}
+
+	char recvChar()
+	{
+		char c;
+		int rc = ::recv(clientSocket, &c, 1, 0);
+		if (rc <= 0)
+			throw Error("gdb: I/O error");
+		return c;
+	}
+
+	void sendChar(char c)
+	{
+		std::unique_lock<std::mutex> lock(outMutex);
+		int rc = ::send(clientSocket, &c, 1, 0);
+		if (rc <= 0)
+			throw Error("gdb: I/O error");
+	}
+
+	u8 unpack(char c)
+	{
+		c = std::tolower(c);
+		if (c <= '9')
+			return c - '0';
+		else
+			return c - 'a' + 10;
+	}
+
+	char packnb(u8 b)
+	{
+		if (b < 10)
+			return '0' + b;
+		else
+			return 'a' + b - 10;
+	}
+
+	std::string packb(u8 v)
+	{
+		std::string s(1, packnb((v >> 4) & 0xf));
+		s += packnb(v & 0xf);
+		return s;
+	}
+
+	std::string pack(u32 v)
+	{
+		return packb(v & 0xff) + packb((v >> 8) & 0xff)
+				+ packb((v >> 16) & 0xff) + packb((v >> 24) & 0xff);
+	}
+
+	u32 unpack(const char *s, int l)
+	{
+		u32 r = 0;
+		for (int i = 0; i < l && *s != '\0'; i += 2, s += 2)
+		{
+			r |= (unpack(s[0]) << 4 | unpack(s[1])) << (i * 4);
+		}
+		return r;
+	}
+
+	std::string recvPacket()
+	{
+		std::string pkt;
+		// look for start character ('$') or BREAK
+		char c = recvChar();
+		if (c == 3)
+			return std::string("\03");
+		if (c != '$')
+			return pkt;
+
+		// read until '#'
+		u8 checksum = 0;
+		while (!stopRequested)
+		{
+			c = recvChar();
+			if (c == '$')
+			{
+				checksum = 0;
+				pkt.clear();
+
+				continue;
+			}
+
+			if (c == '#')
+				break;
+
+			checksum += (u8)c;
+			pkt.push_back(c);
+		}
+		if (stopRequested)
+		{
+			pkt.clear();
+			return pkt;
+		}
+		u8 recvchk = unpack(recvChar()) << 4;
+		recvchk |= unpack(recvChar());
+
+		// If the checksums don't match print a warning, and put the
+		// negative ack back to the client. Otherwise put a positive ack.
+		if (checksum != recvchk)
+		{
+			sendChar('-');	// Failed checksum
+			return "";
+		}
+		else
+		{
+			sendChar('+');	// Successful transfer
+			return pkt;
+		}
+	}
+
+	void sendPacket(const std::string& pkt)
+	{	DEBUG_LOG(NETWORK, "gdb: sending pkt");
+		std::unique_lock<std::mutex> lock(outMutex);
+		std::string data{'$'};
+		u8 checksum = 0;
+		for (char c : pkt)
+		{
+			if (c == '$' || c == '#' || c == '*' || c == '}')
+			{
+				c ^= 0x20;
+				checksum += (u8)'}';
+				data.push_back('}');
+			}
+			checksum += (u8)c;
+			data.push_back(c);
+		}
+		data.push_back('#');
+		char s[9];
+		sprintf(s, "%02x", checksum);
+		data += s;
+		DEBUG_LOG(NETWORK, "gdb: sent %s", data.c_str());
+		int ret = ::send(clientSocket, data.c_str(), data.length(), 0);
+		if (ret < (int)data.length())
+			throw Error("I/O error");
+	}
+
+	bool stopRequested = false;
+	bool attached = false;
+	bool postDebugTrapNeeded = false;
+	sock_t serverSocket = INVALID_SOCKET;
+	sock_t clientSocket = INVALID_SOCKET;
+	std::thread thread;
+	std::mutex outMutex;
+public:
+	DebugAgent agent;
+};
+
+static GdbServer gdbServer;
+
+void init()
+{
+	gdbServer.init();
+}
+
+void term()
+{
+	gdbServer.term();
+}
+
+void debugTrap(u32 event)
+{
+	gdbServer.debugTrap(event);
+}
+
+void subroutineCall()
+{
+	gdbServer.agent.subroutineCall();
+}
+
+void subroutineReturn()
+{
+	gdbServer.agent.subroutineReturn();
+}
+
+static void emuEventCallback(Event event)
+{
+	switch (event)
+	{
+	case Event::Resume:
+		if (!gdbServer.isRunning())
+			gdbServer.run();
+		break;
+	case Event::Terminate:
+		gdbServer.stop();
+		break;
+	default:
+		break;
+	}
+}
+
+}
+#endif
@@ -0,0 +1,43 @@
+/*
+	Copyright 2021 flyinghead
+
+	This file is part of Flycast.
+
+    Flycast is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Flycast is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+namespace debugger {
+
+// exception thrown in response to trap
+struct Stop { };
+
+#ifdef GDB_SERVER
+
+	void init();
+	void term();
+	void run();
+	void debugTrap(u32 event);
+	void subroutineCall();
+	void subroutineReturn();
+
+#else
+	static inline void init() {}
+	static inline void term() {}
+	static inline void run() {}
+	static inline void debugTrap(u32 event) {}
+	static inline void subroutineCall() {}
+	static inline void subroutineReturn() {}
+#endif
+}
@@ -0,0 +1,9 @@
+# Defines the Chromium style for automatic reformatting.
+# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
+BasedOnStyle: Chromium
+
+# This defaults to 'Auto'. Explicitly set it for a while, so that
+# 'vector<vector<int> >' in existing files gets formatted to
+# 'vector<vector<int>>'. ('Auto' means that clang-format will only use
+# 'int>>' if the file already contains at least one such instance.)
+Standard: Cpp11
@@ -0,0 +1,17 @@
+# The JSONPath filter expression used to identify which PRs to close.
+# The data filtered is the pull request data along with other metadata passed in
+# by probot.
+# See http://goessner.net/articles/JsonPath/
+# `true` will close all PRs.
+filters:
+  - true
+
+# The message to post to the closed PR.
+commentBody: |
+  Thanks for your contribution!  Unfortunately, we don't use GitHub pull
+  requests to manage code contributions to this repository.  Instead, please
+  see [README.md](../blob/master/README.md) which provides full instructions
+  on how to get involved.
+
+# Whether to add a label to the closed PR.
+addLabel: false
@@ -0,0 +1,91 @@
+# Copyright 2014 Google Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Ignore other VCSs.
+.repo/
+.svn/
+
+# Ignore common compiled artifacts.
+*~
+*.dwo
+*.o
+lib*.a
+/breakpad.pc
+/breakpad-client.pc
+/src/client/linux/linux_client_unittest_shlib
+/src/client/linux/linux_dumper_unittest_helper
+/src/common/linux/google_crashdump_uploader_test
+/src/processor/microdump_stackwalk
+/src/processor/minidump_dump
+/src/processor/minidump_stackwalk
+/src/tools/linux/core2md/core2md
+/src/tools/linux/core_handler/core_handler
+/src/tools/linux/dump_syms/dump_syms
+/src/tools/linux/md2core/minidump-2-core
+/src/tools/linux/pid2md/pid2md
+/src/tools/linux/symupload/minidump_upload
+/src/tools/linux/symupload/sym_upload
+/src/tools/mac/dump_syms/dump_syms
+/src/tools/mac/dump_syms/dump_syms_mac
+
+# Ignore unit test artifacts.
+*_unittest
+*.log
+*.trs
+
+# Ignore autotools generated artifacts.
+.deps
+.dirstamp
+autom4te.cache/
+/config.cache
+config.h
+/config.log
+/config.status
+/Makefile
+stamp-h1
+
+# Ignore GYP generated Visual Studio artifacts.
+*.filters
+*.sdf
+*.sln
+*.suo
+*.vcproj
+*.vcxproj
+
+# Ignore GYP generated Makefiles
+src/Makefile
+*.Makefile
+*.target.mk
+
+# Ignore compiled Python files.
+*.pyc
+
+# Ignore directories gclient syncs.
+src/testing
+src/third_party/protobuf
+src/tools/gyp
@@ -0,0 +1,34 @@
+# Travis build integration.
+# https://docs.travis-ci.com/
+language: cpp
+
+sudo: required
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - clang
+      - gcc-4.8
+      - g++-4.8
+
+env:
+  global:
+    - secure: "FPczJ1u7FWGXOtUVf5AONeexfQDYnKRtuNs3phLwlPPAbgAlIc/WeTRSHC8DAb1T8IyPdN3Zi7cqLz0dvPol0iX1fWSfr8YdtW0ea8nUYH5ldmmp6H75FEUJUcISmYwL4WN7TldC6Hnzrlbw/0xmBH8gtAgddtBXKc9P9SwEZvM4OiFMHbMPwZEhRj+D95rfH12lgh3D16nbXGnx3rSNbHszvIxrU2VvlLo9Aa+hbmVj5CsBiNJjhDS64ie+VMTkuzcWNqLRYaGOCQ8ftKAlj/fjGfoKjPDN9dSJg9gW1FjOMPeQo93qhSc/hCmTq7sWxBJu48telinUgESdE5q/8gRf5J05ImWPntZAkC/wQkA20K7Kp/fH1CRaYXQMWKjts8c6dQZ5R4WxE4WXUo5rz573Ti9uyVTLys9whnzaib3YbqYv04irkhpgzo3rd8PF8SXpgK99ySQCcv/Dh7UQuXPpcaknOk2mBySXjQDgpQHHXDN2uUek1HEo5xit8fQuQw3TdPIZ9ZgzQ/c5/Dx6sLWAGEfVH9MN+hy6AiZnJ1JI+XF82kAf1pnf8WddHtlE7pAdWRFQt0iOj9T9esV1/o0VCJVzJLRdpKecF0sTpJxDuan6cFI0tNCkNjHFA5wJKYAvdOPAmYkqre7aIIqSOKy3Fjh9JP9CBJFy7eals9U="
+
+# TODO: Add an OS X config.
+matrix:
+  include:
+    - os: linux
+      compiler: gcc
+      env: USE_CC=gcc-4.8 USE_CXX=g++-4.8 COVERITY_SCAN=true
+    - os: linux
+      compiler: clang
+
+before_install: ./scripts/travis-checkout.sh
+script: ./scripts/travis-build.sh
+
+notifications:
+  email:
+    - [email protected]
@@ -0,0 +1 @@
+[email protected]
@@ -0,0 +1,153 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(breakpad)
+
+include_directories(src)
+
+add_library(breakpad_client STATIC src/client/minidump_file_writer.cc)
+target_compile_features(breakpad_client PRIVATE c_std_11 cxx_std_11)
+
+target_sources(breakpad_client PRIVATE
+    	src/common/convert_UTF.cc
+    	src/common/convert_UTF.h
+    	src/common/md5.h
+    	src/common/md5.cc
+    	src/common/string_conversion.cc
+    	src/common/string_conversion.h)
+
+if(APPLE)
+	enable_language(OBJC)
+	set_target_properties(breakpad_client PROPERTIES
+	    FRAMEWORK TRUE
+	    FRAMEWORK_VERSION C
+	    MACOSX_FRAMEWORK_IDENTIFIER com.googlecode.google-breakpad
+	    MACOSX_FRAMEWORK_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/src/client/mac/Framework/Info.plist
+	    # "current version" in semantic format in Mach-O binary file
+	    VERSION 16.4.0
+	    # "compatibility version" in semantic format in Mach-O binary file
+	    SOVERSION 1.0.0
+	    PUBLIC_HEADER src/client/mac/Framework/Breakpad.h
+	    XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
+	target_include_directories(breakpad_client PRIVATE
+		src/third_party/mac/include
+		src/client/apple/Framework
+		src/common/mac)
+	add_compile_definitions(HAVE_MACH_O_NLIST_H)
+	target_sources(breakpad_client PRIVATE
+		src/common/mac/MachIPC.mm
+		src/common/mac/bootstrap_compat.cc
+		src/common/mac/file_id.cc
+		src/common/mac/launch_reporter.h
+		src/common/mac/launch_reporter.cc
+		src/common/mac/macho_id.cc
+		src/common/mac/macho_utilities.cc
+		src/common/mac/macho_walker.cc
+		src/common/mac/string_utilities.cc
+
+		src/client/mac/crash_generation/crash_generation_client.h
+		src/client/mac/crash_generation/crash_generation_client.cc
+		src/client/mac/crash_generation/ConfigFile.h
+		src/client/mac/crash_generation/ConfigFile.mm
+		src/client/mac/crash_generation/Inspector.h
+		src/client/mac/crash_generation/Inspector.mm
+		src/client/mac/crash_generation/InspectorMain.mm
+		src/client/mac/crash_generation/crash_generation_server.cc
+		src/client/mac/handler/breakpad_nlist_64.cc
+		src/client/mac/handler/dynamic_images.cc
+		src/client/mac/handler/exception_handler.cc
+		src/client/mac/handler/minidump_generator.cc
+		src/client/mac/handler/protected_memory_allocator.cc
+		src/client/mac/handler/protected_memory_allocator.h
+		src/client/mac/Framework/Breakpad.h
+		src/client/mac/Framework/Breakpad.mm
+		src/client/mac/Framework/Breakpad_Prefix.pch
+		src/client/mac/Framework/OnDemandServer.h
+		src/client/mac/Framework/OnDemandServer.mm
+
+#	add_executable(dump_syms
+#		src/common/dwarf/bytereader.cc
+#		src/common/dwarf/dwarf2diehandler.cc
+#		src/common/dwarf/dwarf2reader.cc
+#		src/common/dwarf_cfi_to_module.cc
+#		src/common/dwarf_cu_to_module.cc
+#		src/common/dwarf_line_to_module.cc
+#		src/common/language.cc
+#		src/common/mac/dump_syms.mm
+#		src/common/mac/macho_reader.cc
+#		src/common/module.cc
+#		src/common/stabs_reader.cc
+#		src/common/stabs_to_module.cc
+#		src/tools/mac/dump_syms/dump_syms_tool.mm)
+	)
+
+elseif(UNIX)
+    enable_language(ASM)
+    if(ANDROID)
+		target_include_directories(breakpad_client PRIVATE src/common/android/include)
+    endif()
+    target_sources(breakpad_client PRIVATE
+        src/client/linux/crash_generation/crash_generation_client.cc
+		src/client/linux/crash_generation/crash_generation_server.cc
+        src/client/linux/dump_writer_common/thread_info.cc
+        src/client/linux/dump_writer_common/ucontext_reader.cc
+        src/client/linux/handler/exception_handler.h
+        src/client/linux/handler/exception_handler.cc
+        src/client/linux/handler/minidump_descriptor.cc
+    	src/client/linux/handler/minidump_descriptor.h
+    	src/client/linux/log/log.cc
+    	src/client/linux/log/log.h
+    	src/client/linux/microdump_writer/microdump_writer.cc
+    	src/client/linux/microdump_writer/microdump_writer.h
+		src/client/linux/minidump_writer/linux_core_dumper.cc
+		src/client/linux/minidump_writer/linux_core_dumper.h
+    	src/client/linux/minidump_writer/linux_dumper.cc
+    	src/client/linux/minidump_writer/linux_dumper.h
+    	src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+    	src/client/linux/minidump_writer/linux_ptrace_dumper.h
+    	src/client/linux/minidump_writer/minidump_writer.cc
+    	src/client/linux/minidump_writer/minidump_writer.h
+    	src/client/minidump_file_writer-inl.h
+    	src/client/minidump_file_writer.h
+
+    	src/common/linux/breakpad_getcontext.S
+		src/common/linux/elf_core_dump.cc
+		src/common/linux/elf_core_dump.h
+    	src/common/linux/elfutils.cc
+    	src/common/linux/elfutils.h
+    	src/common/linux/file_id.cc
+    	src/common/linux/file_id.h
+    	src/common/linux/guid_creator.cc
+    	src/common/linux/guid_creator.h
+    	src/common/linux/linux_libc_support.cc
+    	src/common/linux/memory_mapped_file.cc
+    	src/common/linux/safe_readlink.cc)
+
+	if(NOT ANDROID)
+		add_executable(dump_syms
+			src/common/dwarf_cfi_to_module.cc
+			src/common/dwarf_cu_to_module.cc
+			src/common/dwarf_line_to_module.cc
+			src/common/dwarf_range_list_handler.cc
+			src/common/language.cc
+			src/common/module.cc
+			src/common/path_helper.cc
+			src/common/stabs_reader.cc
+			src/common/stabs_to_module.cc
+			src/common/dwarf/bytereader.cc
+			src/common/dwarf/dwarf2diehandler.cc
+			src/common/dwarf/dwarf2reader.cc
+			src/common/dwarf/elf_reader.cc
+			src/common/linux/crc32.cc
+			src/common/linux/dump_symbols.cc
+			src/common/linux/dump_symbols.h
+			src/common/linux/elf_symbols_to_module.cc
+			src/common/linux/elf_symbols_to_module.h
+			src/common/linux/elfutils.cc
+			src/common/linux/file_id.cc
+			src/common/linux/linux_libc_support.cc
+			src/common/linux/memory_mapped_file.cc
+			src/common/linux/safe_readlink.cc
+			src/tools/linux/dump_syms/dump_syms.cc)
+		target_compile_definitions(dump_syms PRIVATE HAVE_A_OUT_H)
+	endif()
+endif()
@@ -0,0 +1,84 @@
+# Copyright 2010 Google Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# This is used to mimic the svn:externals mechanism for gclient (both Git and
+# SVN) based checkouts of Breakpad. As such, its use is entirely optional. If
+# using a manually managed SVN checkout as opposed to a gclient managed checkout
+# you can still use the hooks mechanism for generating project files by calling
+# 'gclient runhooks' rather than 'gclient sync'.
+
+deps = {
+  # Testing libraries and utilities.
+  "src/src/testing":
+    "https://github.com/google/googletest.git" +
+      "@4fe018038f87675c083d0cfb6a6b57c274fb1753",
+
+  # Protobuf.
+  "src/src/third_party/protobuf/protobuf":
+    "https://github.com/google/protobuf.git" +
+      "@cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac",
+
+  # GYP project generator.
+  "src/src/tools/gyp":
+    "https://chromium.googlesource.com/external/gyp/" +
+      "@324dd166b7c0b39d513026fa52d6280ac6d56770",
+
+  # Linux syscall support.
+  "src/src/third_party/lss":
+    "https://chromium.googlesource.com/linux-syscall-support/" +
+      "@e1e7b0ad8ee99a875b272c8e33e308472e897660",
+}
+
+hooks = [
+  {
+    # Keep the manifest up to date.
+    "action": ["python", "src/src/tools/python/deps-to-manifest.py",
+               "src/DEPS", "src/default.xml"],
+  },
+]
+
+hooks_os = {
+  'win': [
+    {
+      # TODO(chrisha): Fix the GYP files so that they work without
+      # --no-circular-check.
+      "pattern": ".",
+      "action": ["python",
+                 "src/src/tools/gyp/gyp_main.py",
+                 "--no-circular-check",
+                 "src/src/client/windows/breakpad_client.gyp"],
+    },
+    {
+      # XXX: this and above should all be wired into build/all.gyp ?
+      "action": ["python",
+                 "src/src/tools/gyp/gyp_main.py",
+                 "--no-circular-check",
+                 "src/src/tools/windows/tools_windows.gyp"],
+    },
+  ],
+}
@@ -0,0 +1,370 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
+
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
+
+Basic Installation
+==================
+
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+   The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package, generally using the just-built uninstalled binaries.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS
+     KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
+
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
@@ -0,0 +1,132 @@
+Copyright (c) 2006, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+--------------------------------------------------------------------
+
+Copyright 2001-2004 Unicode, Inc.
+
+Disclaimer
+
+This source code is provided as is by Unicode, Inc. No claims are
+made as to fitness for any particular purpose. No warranties of any
+kind are expressed or implied. The recipient agrees to determine
+applicability of information provided. If this file has been
+purchased on magnetic or optical media from Unicode, Inc., the
+sole remedy for any claim will be exchange of defective media
+within 90 days of receipt.
+
+Limitations on Rights to Redistribute This Code
+
+Unicode, Inc. hereby grants the right to freely use the information
+supplied in this file in the creation of products supporting the
+Unicode Standard, and to make copies of this file in any form
+for internal or external distribution as long as this notice
+remains attached.
+
+--------------------------------------------------------------------
+
+libunwind - a platform-independent unwind library
+   Copyright (C) 2008 Google, Inc
+	Contributed by Paul Pluzhnikov <[email protected]>
+   Copyright (C) 2010 Konstantin Belousov <[email protected]>
+
+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.  */
+
+--------------------------------------------------------------------
+
+Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+
+@APPLE_LICENSE_HEADER_START@
+
+This file contains Original Code and/or Modifications of Original Code
+as defined in and that are subject to the Apple Public Source License
+Version 2.0 (the 'License'). You may not use this file except in
+compliance with the License. Please obtain a copy of the License at
+http://www.opensource.apple.com/apsl/ and read it before using this
+file.
+
+The Original Code and all software distributed under the License are
+distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+Please see the License for the specific language governing rights and
+limitations under the License.
+
+@APPLE_LICENSE_HEADER_END@
+
+--------------------------------------------------------------------
+
+Copyright (c) 1989, 1993
+The Regents of the University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+     This product includes software developed by the University of
+     California, Berkeley and its contributors.
+4. Neither the name of the University nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
@@ -0,0 +1,13 @@
+# Sorted alphabetically.
+# Please see README.md for contact info.
+
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
@@ -0,0 +1,139 @@
+Google Breakpad for Android
+===========================
+
+This document explains how to use the Google Breakpad client library
+on Android, and later generate valid stack traces from the minidumps
+it generates.
+
+This release supports ARM, x86 and MIPS based Android systems.
+This release requires NDK release r11c or higher.
+
+I. Building the client library:
+===============================
+
+The Android client is built as a static library that you can
+link into your own Android native code. There are two ways to
+build it:
+
+I.1. Building with ndk-build:
+-----------------------------
+
+If you're using the ndk-build build system, you can follow
+these simple steps:
+
+  1/ Include android/google_breakpad/Android.mk from your own
+     project's Android.mk
+
+     This can be done either directly, or using ndk-build's
+     import-module feature.
+
+  2/ Link the library to one of your modules by using:
+
+     LOCAL_STATIC_LIBRARIES += breakpad_client
+
+NOTE: The client library requires a C++ STL implementation,
+      which you can select with APP_STL in your Application.mk
+
+      It has been tested succesfully with both STLport and GNU libstdc++
+
+
+I.2. Building with a standalone Android toolchain:
+--------------------------------------------------
+
+All you need to do is configure your build with the right 'host'
+value, and disable the processor and tools, as in:
+
+  $GOOGLE_BREAKPAD_PATH/configure --host=arm-linux-androideabi \
+                                  --disable-processor \
+                                  --disable-tools
+  make -j4
+
+The library will be under src/client/linux/libbreakpad_client.a
+
+You can also use 'make check' to run the test suite on a connected
+Android device. This requires the Android 'adb' tool to be in your
+path.
+
+II. Using the client library in Android:
+========================================
+
+The usage instructions are very similar to the Linux ones that are
+found at https://chromium.googlesource.com/breakpad/breakpad/+/master/docs/linux_starter_guide.md
+
+1/ You need to include "client/linux/handler/exception_handler.h" from a C++
+   source file.
+
+2/ If you're not using ndk-build, you also need to:
+
+   - add the following to your compiler include search paths:
+       $GOOGLE_BREAKPAD_PATH/src
+       $GOOGLE_BREAKPAD_PATH/src/common/android/include
+
+   - add -llog to your linker flags
+
+   Note that ndk-build does that for your automatically.
+
+3/ Keep in mind that there is no /tmp directory on Android.
+
+   If you use the library from a regular Android applications, specify a
+   path under your app-specific storage directory. An alternative is to
+   store them on the SDCard, but this requires a specific permission.
+
+For a concrete example, see the sample test application under
+android/sample_app. See its README for more information.
+
+
+III. Getting a stack trace on the host:
+=======================================
+
+This process is similar to other platforms, but here's a quick example:
+
+1/ Retrieve the minidumps on your development machine.
+
+2/ Dump the symbols for your native libraries with the 'dump_syms' tool.
+   This first requires building the host version of Google Breakpad, then
+   calling:
+
+      dump_syms $PROJECT_PATH/obj/local/$ABI/libfoo.so > libfoo.so.sym
+
+3/ Create the symbol directory hierarchy.
+
+   The first line of the generated libfoo.so.sym will have a "MODULE"
+   entry that carries a hexadecimal version number, e.g.:
+
+     MODULE Linux arm D51B4A5504974FA6ECC1869CAEE3603B0 test_google_breakpad
+
+   Note: The second field could be either 'Linux' or 'Android'.
+
+   Extract the version number, and a 'symbol' directory, for example:
+
+      $PROJECT_PATH/symbols/libfoo.so/$VERSION/
+
+   Copy/Move your libfoo.sym file there.
+
+4/ Invoke minidump_stackwalk to create the stack trace:
+
+     minidump_stackwalk $MINIDUMP_FILE $PROJECT_PATH/symbols
+
+Note that various helper scripts can be found on the web to automate these
+steps.
+
+IV. Verifying the Android build library:
+========================================
+
+If you modify Google Breakpad and want to check that it still works correctly
+on Android, please run the android/run-checks.sh script which will do all
+necessary verifications for you. This includes:
+
+  - Rebuilding the full host binaries.
+  - Rebuilding the full Android binaries with configure/make.
+  - Rebuilding the client library unit tests, and running them on a device.
+  - Rebuilding the client library with ndk-build.
+  - Building, installing and running a test crasher program on a device.
+  - Extracting the corresponding minidump, dumping the test program symbols
+    and generating a stack trace.
+  - Checking the generated stack trace for valid source locations.
+
+For more details, please run:
+
+  android/run-checks.sh --help-all
@@ -0,0 +1,82 @@
+# Breakpad
+
+Breakpad is a set of client and server components which implement a
+crash-reporting system.
+
+* [Homepage](https://chromium.googlesource.com/breakpad/breakpad/)
+* [Documentation](./docs/)
+* [Bugs](https://bugs.chromium.org/p/google-breakpad/)
+* Discussion/Questions: [[email protected]](https://groups.google.com/d/forum/google-breakpad-discuss)
+* Developer/Reviews: [[email protected]](https://groups.google.com/d/forum/google-breakpad-dev)
+* Tests: [![Build Status](https://travis-ci.org/google/breakpad.svg?branch=main)](https://travis-ci.org/google/breakpad) [![Build status](https://ci.appveyor.com/api/projects/status/eguv4emv2rhq68u2?svg=true)](https://ci.appveyor.com/project/vapier/breakpad)
+* Coverage [![Coverity Status](https://scan.coverity.com/projects/9215/badge.svg)](https://scan.coverity.com/projects/google-breakpad)
+
+## Getting started (from main)
+
+1.  First, [download depot_tools](http://dev.chromium.org/developers/how-tos/install-depot-tools)
+    and ensure that they’re in your `PATH`.
+
+2.  Create a new directory for checking out the source code (it must be named
+    breakpad).
+
+    ```sh
+    mkdir breakpad && cd breakpad
+    ```
+
+3.  Run the `fetch` tool from depot_tools to download all the source repos.
+
+    ```sh
+    fetch breakpad
+    cd src
+    ```
+
+4.  Build the source.
+
+    ```sh
+    ./configure && make
+    ```
+
+    You can also cd to another directory and run configure from there to build
+    outside the source tree.
+
+    This will build the processor tools (`src/processor/minidump_stackwalk`,
+    `src/processor/minidump_dump`, etc), and when building on Linux it will
+    also build the client libraries and some tools
+    (`src/tools/linux/dump_syms/dump_syms`,
+    `src/tools/linux/md2core/minidump-2-core`, etc).
+
+5.  Optionally, run tests.
+
+    ```sh
+    make check
+    ```
+
+6.  Optionally, install the built libraries
+
+    ```sh
+    make install
+    ```
+
+If you need to reconfigure your build be sure to run `make distclean` first.
+
+To update an existing checkout to a newer revision, you can
+`git pull` as usual, but then you should run `gclient sync` to ensure that the
+dependent repos are up-to-date.
+
+## To request change review
+
+1.  Follow the steps above to get the source and build it.
+
+2.  Make changes. Build and test your changes.
+    For core code like processor use methods above.
+    For linux/mac/windows, there are test targets in each project file.
+
+3.  Commit your changes to your local repo and upload them to the server.
+    http://dev.chromium.org/developers/contributing-code
+    e.g. `git commit ... && git cl upload ...`
+    You will be prompted for credential and a description.
+
+4.  At https://chromium-review.googlesource.com/ you'll find your issue listed;
+    click on it, then “Add reviewer”, and enter in the code reviewer. Depending
+    on your settings, you may not see an email, but the reviewer has been
+    notified with google-breakpad-dev@googlegroups.com always CC’d.
@@ -0,0 +1,372 @@
+# Copyright (c) 2012 Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Collection of common shell functions for 'run-checks.sh' et 'test-shell.sh'
+
+# All internal variables and functions use an underscore as a prefix
+# (e.g. _VERBOSE, _ALL_CLEANUPS, etc..).
+
+# Sanitize the environment
+export LANG=C
+export LC_ALL=C
+
+if [ "$BASH_VERSION" ]; then
+  set -o posix
+fi
+
+# Utility functions
+
+_ALL_CLEANUPS=
+
+# Register a function to be called when the script exits, even in case of
+# Ctrl-C, logout, etc.
+# $1: function name.
+atexit () {
+  if [ -z "$_ALL_CLEANUPS" ]; then
+    _ALL_CLEANUPS=$1
+    # Ensure a clean exit when the script is:
+    #  - Exiting normally (EXIT)
+    #  - Interrupted by Ctrl-C (INT)
+    #  - Interrupted by log out (HUP)
+    #  - Being asked to quit nicely (TERM)
+    #  - Being asked to quit and dump core (QUIT)
+    trap "_exit_cleanups \$?" EXIT INT HUP QUIT TERM
+  else
+    _ALL_CLEANUPS="$_ALL_CLEANUPS $1"
+  fi
+}
+
+# Called on exit if at least one function was registered with atexit
+# $1: final exit status code
+_exit_cleanups () {
+  local CLEANUP CLEANUPS
+  # Ignore calls to atexit during cleanups
+  CLEANUPS=$_ALL_CLEANUPS
+  _ALL_CLEANUPS=
+  for CLEANUP in $CLEANUPS; do
+    ($CLEANUP)
+  done
+  exit "$@"
+}
+
+
+
+
+# Dump a panic message then exit.
+# $1+: message
+panic () {
+  echo "ERROR: $@" >&2
+  exit 1
+}
+
+# If the previous command failed, dump a panic message then exit.
+# $1+: message.
+fail_panic () {
+  if [ $? != 0 ]; then
+    panic "$@"
+  fi;
+}
+
+_VERBOSE=0
+
+# Increase verbosity for dump/log/run/run2 functions
+increase_verbosity () {
+  _VERBOSE=$(( $_VERBOSE + 1 ))
+}
+
+# Decrease verbosity
+decrease_verbosity () {
+  _VERBOSE=$(( $_VERBOSE - 1 ))
+}
+
+# Returns success iff verbosity level is higher than a specific value
+# $1: verbosity level
+verbosity_is_higher_than () {
+  [ "$_VERBOSE" -gt "$1" ]
+}
+
+# Returns success iff verbosity level is lower than a specific value
+# $1: verbosity level
+verbosity_is_lower_than () {
+  [ "$_VERBOSE" -le "$1" ]
+}
+
+# Dump message to stdout, unless verbosity is < 0, i.e. --quiet was called
+# $1+: message
+dump () {
+  if [ "$_VERBOSE" -ge 0 ]; then
+    printf "%s\n" "$*"
+  fi
+}
+
+# If --verbose was used, dump a message to stdout.
+# $1+: message
+log () {
+  if [ "$_VERBOSE" -ge 1 ]; then
+    printf "%s\n" "$*"
+  fi
+}
+
+_RUN_LOG=
+
+# Set a run log file that can be used to collect the output of commands that
+# are not displayed.
+set_run_log () {
+  _RUN_LOG=$1
+}
+
+# Run a command. Output depends on $_VERBOSE:
+#   $_VERBOSE <= 0:  Run command, store output into the run log
+#   $_VERBOSE >= 1:  Dump command, run it, output goest to stdout
+# Note: Ideally, the command's output would go to the run log for $_VERBOSE >= 1
+#       but the 'tee' tool doesn't preserve the status code of its input pipe
+#       in case of error.
+run () {
+  local LOGILE
+  if [ "$_RUN_LOG" ]; then
+    LOGFILE=$_RUN_LOG
+  else
+    LOGFILE=/dev/null
+  fi
+
+  if [ "$_VERBOSE" -ge 1 ]; then
+    echo "COMMAND: $@"
+    "$@"
+  else
+    "$@" >>$LOGFILE 2>&1
+  fi
+}
+
+# Same as run(), but only dump command output for $_VERBOSE >= 2
+run2 () {
+  local LOGILE
+  if [ "$_RUN_LOG" ]; then
+    LOGFILE=$_RUN_LOG
+  else
+    LOGFILE=/dev/null
+  fi
+
+  if [ "$_VERBOSE" -ge 1 ]; then
+    echo "COMMAND: $@"
+  fi
+  if [ "$_VERBOSE" -ge 2 ]; then
+    "$@"
+  else
+    "$@" >>$LOGFILE 2>&1
+  fi
+}
+
+# Extract number of cores to speed up the builds
+# Out: number of CPU cores
+get_core_count () {
+  case $(uname -s) in
+    Linux)
+      grep -c -e '^processor' /proc/cpuinfo
+      ;;
+    Darwin)
+      sysctl -n hw.ncpu
+      ;;
+    CYGWIN*|*_NT-*)
+      echo $NUMBER_OF_PROCESSORS
+      ;;
+    *)
+      echo 1
+      ;;
+  esac
+}
+
+
+# Check for the Android ADB program.
+#
+# On success, return nothing, but updates internal variables so later calls to
+# adb_shell, adb_push, etc.. will work. You can get the path to the ADB program
+# with adb_get_program if needed.
+#
+# On failure, returns 1, and updates the internal adb error message, which can
+# be retrieved with adb_get_error.
+#
+# $1: optional ADB program path.
+# Return: success or failure.
+_ADB=
+_ADB_STATUS=
+_ADB_ERROR=
+
+adb_check () {
+  # First, try to find the executable in the path, or the SDK install dir.
+  _ADB=$1
+  if [ -z "$_ADB" ]; then
+    _ADB=$(which adb 2>/dev/null)
+    if [ -z "$_ADB" -a "$ANDROID_SDK_ROOT" ]; then
+      _ADB=$ANDROID_SDK_ROOT/platform-tools/adb
+      if [ ! -f "$_ADB" ]; then
+        _ADB=
+      fi
+    fi
+    if [ -z "$_ADB" ]; then
+      _ADB_STATUS=1
+      _ADB_ERROR="The Android 'adb' tool is not in your path."
+      return 1
+    fi
+  fi
+
+  log "Found ADB program: $_ADB"
+
+  # Check that it works correctly
+  local ADB_VERSION
+  ADB_VERSION=$("$_ADB" version 2>/dev/null)
+  case $ADB_VERSION in
+    "Android Debug Bridge "*) # Pass
+      log "Found ADB version: $ADB_VERSION"
+      ;;
+    *) # Fail
+      _ADB_ERROR="Your ADB binary reports a bad version ($ADB_VERSION): $_ADB"
+      _ADB_STATUS=1
+      return 1
+  esac
+
+  _ADB_STATUS=0
+  return 0
+}
+
+
+# Return the path to the Android ADB program, if correctly detected.
+# On failure, return the empty string.
+# Out: ADB program path (or empty on failure)
+# Return: success or failure.
+adb_get_program () {
+  # Return cached value as soon as possible.
+  if [ -z "$_ADB_STATUS" ]; then
+    adb_check $1
+  fi
+  echo "$_ADB"
+  return $_ADB_STATUS
+}
+
+# Return the error corresponding to the last ADB function failure.
+adb_get_error () {
+  echo "$_ADB_ERROR"
+}
+
+# Check that there is one device connected through ADB.
+# In case of failure, use adb_get_error to know why this failed.
+# $1: Optional adb program path
+# Return: success or failure.
+_ADB_DEVICE=
+_ADB_DEVICE_STATUS=
+adb_check_device () {
+  if [ "$_ADB_DEVICE_STATUS" ]; then
+    return $_ADB_DEVICE_STATUS
+  fi
+
+  # Check for ADB.
+  if ! adb_check $1; then
+    _ADB_DEVICE_STATUS=$_ADB_STATUS
+    return 1
+  fi
+
+  local ADB_DEVICES NUM_DEVICES FINGERPRINT
+
+  # Count the number of connected devices.
+  ADB_DEVICES=$("$_ADB" devices 2>/dev/null | awk '$2 == "device" { print $1; }')
+  NUM_DEVICES=$(echo "$ADB_DEVICES" | wc -l)
+  case $NUM_DEVICES in
+    0)
+      _ADB_ERROR="No Android device connected. Please connect one to your machine."
+      _ADB_DEVICE_STATUS=1
+      return 1
+      ;;
+    1) # Pass
+      # Ensure the same device will be called in later adb_shell calls.
+      export ANDROID_SERIAL=$ADB_DEVICES
+      ;;
+    *) # 2 or more devices.
+      if [ "$ANDROID_SERIAL" ]; then
+        ADB_DEVICES=$ANDROID_SERIAL
+        NUM_DEVICES=1
+      else
+        _ADB_ERROR="More than one Android device connected. \
+Please define ANDROID_SERIAL in your environment"
+        _ADB_DEVICE_STATUS=1
+        return 1
+      fi
+      ;;
+  esac
+
+  _ADB_DEVICE_STATUS=0
+  _ADB_DEVICE=$ADB_DEVICES
+
+  FINGERPRINT=$(adb_shell getprop ro.build.fingerprint)
+  log "Using ADB device: $ANDROID_SERIAL ($FINGERPRINT)"
+  return 0
+}
+
+# The 'adb shell' command is pretty hopeless, try to make sense of it by:
+#   1/ Removing trailing \r from line endings.
+#   2/ Ensuring the function returns the command's status code.
+#
+# $1+: Command
+# Out: command output (stdout + stderr combined)
+# Return: command exit status
+adb_shell () {
+  local RET ADB_LOG
+  # Check for ADB device.
+  adb_check_device || return 1
+  ADB_LOG=$(mktemp "${TMPDIR:-/tmp}/adb-XXXXXXXX")
+  "$_ADB" shell "$@" ";" echo \$? > "$ADB_LOG" 2>&1
+  sed -i -e 's![[:cntrl:]]!!g' "$ADB_LOG"  # Remove \r.
+  RET=$(sed -e '$!d' "$ADB_LOG")           # Last line contains status code.
+  sed -e '$d' "$ADB_LOG"                   # Print everything except last line.
+  rm -f "$ADB_LOG"
+  return $RET
+}
+
+# Push a file to a device.
+# $1: source file path
+# $2: device target file path
+# Return: success or failure.
+adb_push () {
+  adb_check_device || return 1
+  run "$_ADB" push "$1" "$2"
+}
+
+# Pull a file from a device
+# $1: device file path
+# $2: target host file path
+# Return: success or failure.
+adb_pull () {
+  adb_check_device || return 1
+  run "$_ADB" pull "$1" "$2"
+}
+
+# Same as adb_push, but will panic if the operations didn't succeed.
+adb_install () {
+  adb_push "$@"
+  fail_panic "Failed to install $1 to the Android device at $2"
+}
+
@@ -0,0 +1,104 @@
+# Copyright (c) 2012, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# ndk-build module definition for the Google Breakpad client library
+#
+# To use this file, do the following:
+#
+#   1/ Include this file from your own Android.mk, either directly
+#      or with through the NDK's import-module function.
+#
+#   2/ Use the client static library in your project with:
+#
+#      LOCAL_STATIC_LIBRARIES += breakpad_client
+#
+#   3/ In your source code, include "src/client/linux/exception_handler.h"
+#      and use the Linux instructions to use it.
+#
+# This module works with either the STLport or GNU libstdc++, but you need
+# to select one in your Application.mk
+#
+
+# The top Google Breakpad directory.
+# We assume this Android.mk to be under 'android/google_breakpad'
+
+LOCAL_PATH := $(call my-dir)/../..
+
+# Defube the client library module, as a simple static library that
+# exports the right include path / linker flags to its users.
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := breakpad_client
+
+LOCAL_CPP_EXTENSION := .cc
+
+# Breakpad uses inline ARM assembly that requires the library
+# to be built in ARM mode. Otherwise, the build will fail with
+# cryptic assembler messages like:
+#   Compile++ thumb  : google_breakpad_client <= crash_generation_client.cc
+#   /tmp/cc8aMSoD.s: Assembler messages:
+#   /tmp/cc8aMSoD.s:132: Error: invalid immediate: 288 is out of range
+#   /tmp/cc8aMSoD.s:244: Error: invalid immediate: 296 is out of range
+LOCAL_ARM_MODE := arm
+
+# List of client source files, directly taken from Makefile.am
+LOCAL_SRC_FILES := \
+    src/client/linux/crash_generation/crash_generation_client.cc \
+    src/client/linux/dump_writer_common/thread_info.cc \
+    src/client/linux/dump_writer_common/ucontext_reader.cc \
+    src/client/linux/handler/exception_handler.cc \
+    src/client/linux/handler/minidump_descriptor.cc \
+    src/client/linux/log/log.cc \
+    src/client/linux/microdump_writer/microdump_writer.cc \
+    src/client/linux/minidump_writer/linux_dumper.cc \
+    src/client/linux/minidump_writer/linux_ptrace_dumper.cc \
+    src/client/linux/minidump_writer/minidump_writer.cc \
+    src/client/minidump_file_writer.cc \
+    src/common/convert_UTF.cc \
+    src/common/md5.cc \
+    src/common/string_conversion.cc \
+    src/common/linux/breakpad_getcontext.S \
+    src/common/linux/elfutils.cc \
+    src/common/linux/file_id.cc \
+    src/common/linux/guid_creator.cc \
+    src/common/linux/linux_libc_support.cc \
+    src/common/linux/memory_mapped_file.cc \
+    src/common/linux/safe_readlink.cc
+
+LOCAL_C_INCLUDES        := $(LOCAL_PATH)/src/common/android/include \
+                           $(LOCAL_PATH)/src \
+                           $(LSS_PATH)
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
+LOCAL_EXPORT_LDLIBS     := -llog
+
+include $(BUILD_STATIC_LIBRARY)
+
+# Done.
@@ -0,0 +1,555 @@
+#!/bin/sh
+# Copyright (c) 2012 Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Sanitize the environment
+export LANG=C
+export LC_ALL=C
+
+if [ "$BASH_VERSION" ]; then
+  set -o posix
+fi
+
+PROGDIR=$(dirname "$0")
+PROGDIR=$(cd "$PROGDIR" && pwd)
+PROGNAME=$(basename "$0")
+
+. $PROGDIR/common-functions.sh
+
+DEFAULT_ABI="armeabi"
+VALID_ABIS="armeabi armeabi-v7a x86 mips"
+
+ABI=
+ADB=
+ALL_TESTS=
+ENABLE_M32=
+HELP=
+HELP_ALL=
+NDK_DIR=
+NO_CLEANUP=
+NO_DEVICE=
+NUM_JOBS=$(get_core_count)
+TMPDIR=
+
+for opt do
+  # The following extracts the value if the option is like --name=<value>.
+  optarg=$(expr -- $opt : '^--[^=]*=\(.*\)$')
+  case $opt in
+    --abi=*) ABI=$optarg;;
+    --adb=*) ADB=$optarg;;
+    --all-tests) ALL_TESTS=true;;
+    --enable-m32) ENABLE_M32=true;;
+    --help|-h|-?) HELP=TRUE;;
+    --help-all) HELP_ALL=true;;
+    --jobs=*) NUM_JOBS=$optarg;;
+    --ndk-dir=*) NDK_DIR=$optarg;;
+    --tmp-dir=*) TMPDIR=$optarg;;
+    --no-cleanup) NO_CLEANUP=true;;
+    --no-device) NO_DEVICE=true;;
+    --quiet) decrease_verbosity;;
+    --verbose) increase_verbosity;;
+    -*) panic "Invalid option '$opt', see --help for details.";;
+    *) panic "This script doesn't take any parameters. See --help for details."
+       ;;
+  esac
+done
+
+if [ "$HELP" -o "$HELP_ALL" ]; then
+  echo "\
+  Usage: $PROGNAME [options]
+
+  This script is used to check that your Google Breakpad source tree can
+  be properly built for Android, and that the client library and host tools
+  work properly together.
+"
+  if [ "$HELP_ALL" ]; then
+    echo "\
+  In more details, this script will:
+
+  - Rebuild the host version of Google Breakpad in a temporary
+    directory (with the Auto-tools based build system).
+
+  - Rebuild the Android client library with the Google Breakpad build
+    system (using autotools/configure). This requires that you define
+    ANDROID_NDK_ROOT in your environment to point to a valid Android NDK
+    installation directory, or use the --ndk-dir=<path> option.
+
+  - Rebuild the Android client library and a test crashing program with the
+    Android NDK build system (ndk-build).
+
+  - Require an Android device connected to your machine, and the 'adb'
+    tool in your path. They are used to:
+
+      - Install and  run a test crashing program.
+      - Extract the corresponding minidump from the device.
+      - Dump the symbols from the test program on the host with 'dump_syms'
+      - Generate a stack trace with 'minidump_stackwalk'
+      - Check the stack trace content for valid source file locations.
+
+    You can however skip this requirement and only test the builds by using
+    the --no-device flag.
+
+    By default, all generated files will be created in a temporary directory
+    that is removed when the script completion. If you want to inspect the
+    files, use the --no-cleanup option.
+
+    Finally, use --verbose to increase the verbosity level, this will help
+    you see which exact commands are being issues and their result. Use the
+    flag twice for even more output. Use --quiet to decrease verbosity
+    instead and run the script silently.
+
+    If you have a device connected, the script will probe it to determine
+    its primary CPU ABI, and build the test program for it. You can however
+    use the --abi=<name> option to override this (this can be useful to check
+    the secondary ABI, e.g. using --abi=armeabi to check that such a program
+    works correctly on an ARMv7-A device).
+
+    If you don't have a device connected, the test program will be built (but
+    not run) with the default '$DEFAULT_ABI' ABI. Again, you can use
+    --abi=<name> to override this. Valid ABI names are:
+
+        $VALID_ABIS
+
+    The script will only run the client library unit test on the device
+    by default. You can use --all-tests to also build and run the unit
+    tests for the Breakpad tools and processor, but be warned that this
+    adds several minutes of testing time. --all-tests will also run the
+    host unit tests suite.
+"
+
+  fi  # HELP_ALL
+
+  echo "\
+  Valid options:
+
+      --help|-h|-?     Display this message.
+      --help-all       Display extended help.
+      --enable-m32     Build 32-bit version of host tools.
+      --abi=<name>     Specify target CPU ABI [auto-detected].
+      --jobs=<count>   Run <count> build tasks in parallel [$NUM_JOBS].
+      --ndk-dir=<path> Specify NDK installation directory.
+      --tmp-dir=<path> Specify temporary directory (will be wiped-out).
+      --adb=<path>     Specify adb program path.
+      --no-cleanup     Don't remove temporary directory after completion.
+      --no-device      Do not try to detect devices, nor run crash test.
+      --all-tests      Run all unit tests (i.e. tools and processor ones too).
+      --verbose        Increase verbosity.
+      --quiet          Decrease verbosity."
+
+  exit 0
+fi
+
+TESTAPP_DIR=$PROGDIR/sample_app
+
+# Select NDK install directory.
+if [ -z "$NDK_DIR" ]; then
+  if [ -z "$ANDROID_NDK_ROOT" ]; then
+    panic "Please define ANDROID_NDK_ROOT in your environment, or use \
+--ndk-dir=<path>."
+  fi
+  NDK_DIR="$ANDROID_NDK_ROOT"
+  log "Found NDK directory: $NDK_DIR"
+else
+  log "Using NDK directory: $NDK_DIR"
+fi
+# Small sanity check.
+NDK_BUILD="$NDK_DIR/ndk-build"
+if [ ! -f "$NDK_BUILD" ]; then
+  panic "Your NDK directory is not valid (missing ndk-build): $NDK_DIR"
+fi
+
+# Ensure the temporary directory is deleted on exit, except if the --no-cleanup
+# option is used.
+
+clean_tmpdir () {
+  if [ "$TMPDIR" ]; then
+    if [ -z "$NO_CLEANUP" ]; then
+      log "Cleaning up: $TMPDIR"
+      rm -rf "$TMPDIR"
+    else
+      dump "Temporary directory contents preserved: $TMPDIR"
+    fi
+  fi
+  exit "$@"
+}
+
+atexit clean_tmpdir
+
+# If --tmp-dir=<path> is not used, create a temporary directory.
+# Otherwise, start by cleaning up the user-provided path.
+if [ -z "$TMPDIR" ]; then
+  TMPDIR=$(mktemp -d /tmp/$PROGNAME.XXXXXXXX)
+  fail_panic "Can't create temporary directory!"
+  log "Using temporary directory: $TMPDIR"
+else
+  if [ ! -d "$TMPDIR" ]; then
+    mkdir -p "$TMPDIR"
+    fail_panic "Can't create temporary directory: $TMPDIR"
+  else
+    log "Cleaning up temporary directory: $TMPDIR"
+    rm -rf "$TMPDIR"/*
+    fail_panic "Cannot cleanup temporary directory!"
+  fi
+fi
+
+if [ -z "$NO_DEVICE" ]; then
+  if ! adb_check_device $ADB; then
+    echo "$(adb_get_error)"
+    echo "Use --no-device to build the code without running any tests."
+    exit 1
+  fi
+fi
+
+BUILD_LOG="$TMPDIR/build.log"
+RUN_LOG="$TMPDIR/run.log"
+CRASH_LOG="$TMPDIR/crash.log"
+
+set_run_log "$RUN_LOG"
+
+TMPHOST="$TMPDIR/host-local"
+
+cd "$TMPDIR"
+
+# Build host version of the tools
+dump "Building host binaries."
+CONFIGURE_FLAGS=
+if [ "$ENABLE_M32" ]; then
+  CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-m32"
+fi
+(
+  run mkdir "$TMPDIR/build-host" &&
+  run cd "$TMPDIR/build-host" &&
+  run2 "$PROGDIR/../configure" --prefix="$TMPHOST" $CONFIGURE_FLAGS &&
+  run2 make -j$NUM_JOBS install
+)
+fail_panic "Can't build host binaries!"
+
+if [ "$ALL_TESTS" ]; then
+  dump "Running host unit tests."
+  (
+    run cd "$TMPDIR/build-host" &&
+    run2 make -j$NUM_JOBS check
+  )
+  fail_panic "Host unit tests failed!!"
+fi
+
+TMPBIN=$TMPHOST/bin
+
+# Generate a stand-alone NDK toolchain
+
+# Extract CPU ABI and architecture from device, if any.
+if adb_check_device; then
+  DEVICE_ABI=$(adb_shell getprop ro.product.cpu.abi)
+  DEVICE_ABI2=$(adb_shell getprop ro.product.cpu.abi2)
+  if [ -z "$DEVICE_ABI" ]; then
+    panic "Can't extract ABI from connected device!"
+  fi
+  if [ "$DEVICE_ABI2" ]; then
+    dump "Found device ABIs: $DEVICE_ABI $DEVICE_ABI2"
+  else
+    dump "Found device ABI: $DEVICE_ABI"
+    DEVICE_ABI2=$DEVICE_ABI
+  fi
+
+  # If --abi=<name> is used, check that the device supports it.
+  if [ "$ABI" -a "$DEVICE_ABI" != "$ABI" -a "$DEVICE_ABI2" != "$ABI" ]; then
+    dump  "ERROR: Device ABI(s) do not match --abi command-line value ($ABI)!"
+    panic "Please use --no-device to skip device tests."
+  fi
+
+  if [ -z "$ABI" ]; then
+    ABI=$DEVICE_ABI
+    dump "Using CPU ABI: $ABI (device)"
+  else
+    dump "Using CPU ABI: $ABI (command-line)"
+  fi
+else
+  if [ -z "$ABI" ]; then
+    # No device connected, choose default ABI
+    ABI=$DEFAULT_ABI
+    dump "Using CPU ABI: $ABI (default)"
+  else
+    dump "Using CPU ABI: $ABI (command-line)"
+  fi
+fi
+
+# Check the ABI value
+VALID=
+for VALID_ABI in $VALID_ABIS; do
+  if [ "$ABI" = "$VALID_ABI" ]; then
+    VALID=true
+    break
+  fi
+done
+
+if [ -z "$VALID" ]; then
+  panic "Unknown CPU ABI '$ABI'. Valid values are: $VALID_ABIS"
+fi
+
+# Extract architecture name from ABI
+case $ABI in
+  armeabi*) ARCH=arm;;
+  *) ARCH=$ABI;;
+esac
+
+# Extract GNU configuration name
+case $ARCH in
+  arm)
+    GNU_CONFIG=arm-linux-androideabi
+    ;;
+  x86)
+    GNU_CONFIG=i686-linux-android
+    ;;
+  mips)
+    GNU_CONFIG=mipsel-linux-android
+    ;;
+  *)
+    GNU_CONFIG="$ARCH-linux-android"
+    ;;
+esac
+
+# Generate standalone NDK toolchain installation
+NDK_STANDALONE="$TMPDIR/ndk-$ARCH-toolchain"
+echo "Generating NDK standalone toolchain installation"
+mkdir -p "$NDK_STANDALONE"
+# NOTE: The --platform=android-9 is required to provide <regex.h> for GTest.
+run "$NDK_DIR/build/tools/make-standalone-toolchain.sh" \
+      --arch="$ARCH" \
+      --platform=android-9 \
+      --install-dir="$NDK_STANDALONE"
+fail_panic "Can't generate standalone NDK toolchain installation!"
+
+# Rebuild the client library, processor and tools with the auto-tools based
+# build system. Even though it's not going to be used, this checks that this
+# still works correctly.
+echo "Building full Android binaries with configure/make"
+TMPTARGET="$TMPDIR/target-local"
+(
+  PATH="$NDK_STANDALONE/bin:$PATH"
+  run mkdir "$TMPTARGET" &&
+  run mkdir "$TMPDIR"/build-target &&
+  run cd "$TMPDIR"/build-target &&
+  run2 "$PROGDIR"/../configure --prefix="$TMPTARGET" \
+                               --host="$GNU_CONFIG" &&
+  run2 make -j$NUM_JOBS install
+)
+fail_panic "Could not rebuild Android binaries!"
+
+# Build and/or run unit test suite.
+# If --no-device is used, only rebuild it, otherwise, run in on the
+# connected device.
+if [ "$NO_DEVICE" ]; then
+  ACTION="Building"
+  # This is a trick to force the Makefile to ignore running the scripts.
+  TESTS_ENVIRONMENT="TESTS_ENVIRONMENT=true"
+else
+  ACTION="Running"
+  TESTS_ENVIRONMENT=
+fi
+
+(
+  PATH="$NDK_STANDALONE/bin:$PATH"
+  run cd "$TMPDIR"/build-target &&
+  # Reconfigure to only run the client unit test suite.
+  # This one should _never_ fail.
+  dump "$ACTION Android client library unit tests."
+  run2 "$PROGDIR"/../configure --prefix="$TMPTARGET" \
+                               --host="$GNU_CONFIG" \
+                               --disable-tools \
+                               --disable-processor &&
+  run make -j$NUM_JOBS check $TESTS_ENVIRONMENT || exit $?
+
+  if [ "$ALL_TESTS" ]; then
+    dump "$ACTION Tools and processor unit tests."
+    # Reconfigure to run the processor and tools tests.
+    # Most of these fail for now, so do not worry about it.
+    run2 "$PROGDIR"/../configure --prefix="$TMPTARGET" \
+                                 --host="$GNU_CONFIG" &&
+    run make -j$NUM_JOBS check $TESTS_ENVIRONMENT
+    if [ $? != 0 ]; then
+      dump "Tools and processor unit tests failed as expected. \
+Use --verbose for results."
+    fi                           
+  fi
+)
+fail_panic "Client library unit test suite failed!"
+
+# Copy sources to temporary directory
+PROJECT_DIR=$TMPDIR/project
+dump "Copying test program sources to: $PROJECT_DIR"
+run cp -r "$TESTAPP_DIR" "$PROJECT_DIR" &&
+run rm -rf "$PROJECT_DIR/obj" &&
+run rm -rf "$PROJECT_DIR/libs"
+fail_panic "Could not copy test program sources to: $PROJECT_DIR"
+
+# Build the test program with ndk-build.
+dump "Building test program with ndk-build"
+export NDK_MODULE_PATH="$PROGDIR"
+NDK_BUILD_FLAGS="-j$NUM_JOBS"
+if verbosity_is_higher_than 1; then
+  NDK_BUILD_FLAGS="$NDK_BUILD_FLAGS NDK_LOG=1 V=1"
+fi
+run "$NDK_DIR/ndk-build" -C "$PROJECT_DIR" $NDK_BUILD_FLAGS APP_ABI=$ABI
+fail_panic "Can't build test program!"
+
+# Unless --no-device was used, stop right here if ADB isn't in the path,
+# or there is no connected device.
+if [ "$NO_DEVICE" ]; then
+  dump "Done. Please connect a device to run all tests!"
+  clean_exit 0
+fi
+
+# Push the program to the device.
+TESTAPP=test_google_breakpad
+TESTAPP_FILE="$PROJECT_DIR/libs/$ABI/test_google_breakpad"
+if [ ! -f "$TESTAPP_FILE" ]; then
+  panic "Device requires '$ABI' binaries. None found!"
+fi
+
+# Run the program there
+dump "Installing test program on device"
+DEVICE_TMP=/data/local/tmp
+adb_push "$TESTAPP_FILE" "$DEVICE_TMP/"
+fail_panic "Cannot push test program to device!"
+
+dump "Running test program on device"
+adb_shell cd "$DEVICE_TMP" "&&" ./$TESTAPP > "$CRASH_LOG" 2>/dev/null
+if [ $? = 0 ]; then
+  panic "Test program did *not* crash as expected!"
+fi
+if verbosity_is_higher_than 0; then
+  echo -n "Crash log: "
+  cat "$CRASH_LOG"
+fi
+
+# Extract minidump from device
+MINIDUMP_NAME=$(awk '$1 == "Dump" && $2 == "path:" { print $3; }' "$CRASH_LOG")
+MINIDUMP_NAME=$(basename "$MINIDUMP_NAME")
+if [ -z "$MINIDUMP_NAME" ]; then
+  panic "Test program didn't write minidump properly!"
+fi
+
+dump "Extracting minidump: $MINIDUMP_NAME"
+adb_pull "$DEVICE_TMP/$MINIDUMP_NAME" .
+fail_panic "Can't extract minidump!"
+
+dump "Parsing test program symbols"
+if verbosity_is_higher_than 1; then
+  log "COMMAND: $TMPBIN/dump_syms \
+                $PROJECT_DIR/obj/local/$ABI/$TESTAPP >$TESTAPP.sym"
+fi
+"$TMPBIN/dump_syms" "$PROJECT_DIR/obj/local/$ABI/$TESTAPP" > $TESTAPP.sym
+fail_panic "dump_syms doesn't work!"
+
+VERSION=$(awk '$1 == "MODULE" { print $4; }' $TESTAPP.sym)
+dump "Found module version: $VERSION"
+if [ -z "$VERSION" ]; then
+  echo "ERROR: Can't find proper module version from symbol dump!"
+  head -n5 $TESTAPP.sym
+  clean_exit 1
+fi
+
+run mkdir -p "$TMPDIR/symbols/$TESTAPP/$VERSION"
+run mv $TESTAPP.sym "$TMPDIR/symbols/$TESTAPP/$VERSION/"
+
+dump "Generating stack trace"
+# Don't use 'run' to be able to send stdout and stderr to two different files.
+log "COMMAND: $TMPBIN/minidump_stackwalk $MINIDUMP_NAME symbols"
+"$TMPBIN/minidump_stackwalk" $MINIDUMP_NAME \
+                             "$TMPDIR/symbols" \
+                             > "$BUILD_LOG" 2>>"$RUN_LOG"
+fail_panic "minidump_stackwalk doesn't work!"
+
+dump "Checking stack trace content"
+
+if verbosity_is_higher_than 1; then
+  cat "$BUILD_LOG"
+fi
+
+# The generated stack trace should look like the following:
+#
+# Thread 0 (crashed)
+#  0  test_google_breakpad!crash [test_breakpad.cpp : 17 + 0x4]
+#      r4 = 0x00015530    r5 = 0xbea2cbe4    r6 = 0xffffff38    r7 = 0xbea2cb5c
+#      r8 = 0x00000000    r9 = 0x00000000   r10 = 0x00000000    fp = 0x00000000
+#      sp = 0xbea2cb50    lr = 0x00009025    pc = 0x00008f84
+#     Found by: given as instruction pointer in context
+#  1  test_google_breakpad!main [test_breakpad.cpp : 25 + 0x3]
+#      r4 = 0x00015530    r5 = 0xbea2cbe4    r6 = 0xffffff38    r7 = 0xbea2cb5c
+#      r8 = 0x00000000    r9 = 0x00000000   r10 = 0x00000000    fp = 0x00000000
+#      sp = 0xbea2cb50    pc = 0x00009025
+#     Found by: call frame info
+#  2  libc.so + 0x164e5
+#      r4 = 0x00008f64    r5 = 0xbea2cc34    r6 = 0x00000001    r7 = 0xbea2cc3c
+#      r8 = 0x00000000    r9 = 0x00000000   r10 = 0x00000000    fp = 0x00000000
+#      sp = 0xbea2cc18    pc = 0x400c34e7
+#     Found by: call frame info
+# ...
+#
+# The most important part for us is ensuring that the source location could
+# be extracted, so look at the 'test_breakpad.cpp' references here.
+#
+# First, extract all the lines with test_google_breakpad! in them, and
+# dump the corresponding crash location.
+#
+# Note that if the source location can't be extracted, the second field
+# will only be 'test_google_breakpad' without the exclamation mark.
+#
+LOCATIONS=$(awk '$2 ~ "^test_google_breakpad!.*" { print $3; }' "$BUILD_LOG")
+
+if [ -z "$LOCATIONS" ]; then
+  if verbosity_is_lower_than 1; then
+    cat "$BUILD_LOG"
+  fi
+  panic "No source location found in stack trace!"
+fi
+
+# Now check that they all match "[<source file>"
+BAD_LOCATIONS=
+for LOCATION in $LOCATIONS; do
+  case $LOCATION in
+    # Escape the opening bracket, or some shells like Dash will not
+    # match them properly.
+    \[*.cpp|\[*.cc|\[*.h) # These are valid source locations in our executable
+      ;;
+    *) # Everything else is not!
+      BAD_LOCATIONS="$BAD_LOCATIONS $LOCATION"
+      ;;
+  esac
+done
+
+if [ "$BAD_LOCATIONS" ]; then
+  dump "ERROR: Generated stack trace doesn't contain valid source locations:"
+  cat "$BUILD_LOG"
+  echo "Bad locations are: $BAD_LOCATIONS"
+  exit 1
+fi
+
+echo "All clear! Congratulations."
+
@@ -0,0 +1,32 @@
+This is a sample Android executable that can be used to test the
+Google Breakpad client library on Android.
+
+Its purpose is simply to crash and generate a minidump under /data/local/tmp.
+
+Build instructions:
+
+   cd android/sample_app
+   $NDK/ndk-build
+
+  Where $NDK points to a valid Android NDK installation.
+
+Usage instructions:
+
+   After buildind the test program, send it to a device, then run it as
+   the shell UID:
+
+     adb push libs/armeabi/test_google_breakpad /data/local/tmp
+     adb shell /data/local/tmp/test_google_breakpad
+
+   This will simply crash after dumping the name of the generated minidump
+   file.
+
+   See jni/test_breakpad.cpp for details.
+
+   Use 'armeabi-v7a' instead of 'armeabi' above to test the ARMv7-A version
+   of the binary.
+
+Note:
+   If you plan to use the library in a regular Android application, store
+   the minidump files either to your app-specific directory, or to the SDCard
+   (the latter requiring a specific permission).
@@ -0,0 +1,44 @@
+# Copyright (c) 2012, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := test_google_breakpad
+LOCAL_SRC_FILES := test_breakpad.cpp
+LOCAL_STATIC_LIBRARIES += breakpad_client
+include $(BUILD_EXECUTABLE)
+
+# If NDK_MODULE_PATH is defined, import the module, otherwise do a direct
+# includes. This allows us to build in all scenarios easily.
+ifneq ($(NDK_MODULE_PATH),)
+  $(call import-module,google_breakpad)
+else
+  include $(LOCAL_PATH)/../../google_breakpad/Android.mk
+endif
@@ -0,0 +1,32 @@
+# Copyright (c) 2012, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+APP_STL := stlport_static
+APP_ABI := all
+APP_CXXFLAGS := -std=c++11 -D__STDC_LIMIT_MACROS
@@ -0,0 +1,57 @@
+// Copyright (c) 2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <stdio.h>
+
+#include "client/linux/handler/exception_handler.h"
+#include "client/linux/handler/minidump_descriptor.h"
+
+namespace {
+
+bool DumpCallback(const google_breakpad::MinidumpDescriptor& descriptor,
+                  void* context,
+                  bool succeeded) {
+  printf("Dump path: %s\n", descriptor.path());
+  return succeeded;
+}
+
+void Crash() {
+  volatile int* a = reinterpret_cast<volatile int*>(NULL);
+  *a = 1;
+}
+
+}  // namespace
+
+int main(int argc, char* argv[]) {
+  google_breakpad::MinidumpDescriptor descriptor(".");
+  google_breakpad::ExceptionHandler eh(descriptor, NULL, DumpCallback,
+                                       NULL, true, -1);
+  Crash();
+  return 0;
+}
@@ -0,0 +1,131 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+# Slightly modified for Android, see ANDROID comment below.
+
+scriptversion=2012-06-27.10; # UTC
+
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <[email protected]> or send patches to
+# <[email protected]>.
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+  echo "$0: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+Usage:
+  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+              [--expect-failure={yes|no}] [--color-tests={yes|no}]
+              [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+END
+}
+
+# TODO: better error handling in option parsing (in particular, ensure
+# TODO: $log_file, $trs_file and $test_name are defined).
+test_name= # Used for reporting.
+log_file=  # Where to save the output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "test-driver $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) enable_hard_errors=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+  esac
+  shift
+done
+
+if test $color_tests = yes; then
+  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
+  red='[0;31m' # Red.
+  grn='[0;32m' # Green.
+  lgn='[1;32m' # Light green.
+  blu='[1;34m' # Blue.
+  mgn='[0;35m' # Magenta.
+  std='[m'     # No color.
+else
+  red= grn= lgn= blu= mgn= std=
+fi
+
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+
+# Test script is run here.
+# ANDROID: old line was: "$@" > $log_file 2>&1
+progdir=$(dirname "$0")
+"$progdir/test-shell.sh" "$@" > $log_file 2>&1
+estatus=$?
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+  estatus=1
+fi
+
+case $estatus:$expect_failure in
+  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
+  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
+esac
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
@@ -0,0 +1,131 @@
+#!/bin/sh
+#
+# Copyright (c) 2012 Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# A special shell wrapper that can be used to run the Google Breakpad unit
+# tests on a connected Android device.
+#
+# This is designed to be called from the Makefile during 'make check'
+#
+
+PROGDIR=$(dirname "$0")
+PROGNAME=$(basename "$0")
+. $PROGDIR/common-functions.sh
+
+# Extract test program name first.
+TEST_PROGRAM=$1
+shift
+
+if [ -z "$TEST_PROGRAM" ]; then
+  panic "No test program/script name on the command-line!"
+fi
+
+if [ ! -f "$TEST_PROGRAM" ]; then
+  panic "Can't find test program/script: $TEST_PROGRAM"
+fi
+
+# Create test directory on the device
+TEST_DIR=/data/local/tmp/test-google-breakpad-$$
+adb_shell mkdir "$TEST_DIR" ||
+    panic "Can't create test directory on device: $TEST_DIR"
+
+# Ensure that it is always removed when the script exits.
+clean_test_dir () {
+  # Don't care about success/failure, use '$ADB shell' directly.
+  adb_shell rm -r "$TEST_DIR"
+}
+
+atexit clean_test_dir
+
+TEST_PROGRAM_NAME=$(basename "$TEST_PROGRAM")
+TEST_PROGRAM_DIR=$(dirname "$TEST_PROGRAM")
+
+# Handle special case(s) here.
+DATA_FILES=
+case $TEST_PROGRAM_NAME in
+  linux_client_unittest)
+    # linux_client_unittest will call another executable at runtime, ensure
+    # it is installed too.
+    adb_install "$TEST_PROGRAM_DIR/linux_dumper_unittest_helper" "$TEST_DIR"
+    # linux_client_unittest loads a shared library at runtime, ensure it is
+    # installed too.
+    adb_install "$TEST_PROGRAM_DIR/linux_client_unittest_shlib" "$TEST_DIR"
+    ;;
+  basic_source_line_resolver_unittest)
+    DATA_FILES="module1.out \
+                module2.out \
+                module3_bad.out \
+                module4_bad.out"
+    ;;
+  exploitability_unittest)
+    DATA_FILES="scii_read_av.dmp \
+                ascii_read_av_block_write.dmp \
+                ascii_read_av_clobber_write.dmp \
+                ascii_read_av_conditional.dmp \
+                ascii_read_av_non_null.dmp \
+                ascii_read_av_then_jmp.dmp \
+                ascii_read_av_xchg_write.dmp \
+                ascii_write_av.dmp \
+                ascii_write_av_arg_to_call.dmp \
+                exec_av_on_stack.dmp \
+                null_read_av.dmp \
+                null_write_av.dmp \
+                read_av.dmp \
+                null_read_av.dmp \
+                write_av_non_null.dmp"
+    ;;
+  fast_source_line_resolver_unittest)
+    DATA_FILES="module0.out \
+                module1.out \
+                module2.out \
+                module3_bad.out \
+                module4_bad.out"
+    ;;
+  minidump_processor_unittest|minidump_unittest)
+    DATA_FILES="src/processor/testdata/minidump2.dmp"
+    ;;
+esac
+
+# Install the data files, their path is relative to the environment
+# variable 'srcdir'
+for FILE in $DATA_FILES; do
+  FILEDIR=src/processor/testdata/$(dirname "$FILE")
+  adb_shell mkdir -p "$TEST_DIR/$FILEDIR"
+  adb_install "${srcdir:-.}/$FILE" "$TEST_DIR"/"$FILE"
+done
+
+# Copy test program to device
+adb_install "$TEST_PROGRAM" "$TEST_DIR"
+
+# Run it
+adb_shell "cd $TEST_DIR && LD_LIBRARY_PATH=. ./$TEST_PROGRAM_NAME $@"
+
+# Note: exiting here will call cleanup_exit which will remove the temporary
+#       files from the device.
@@ -0,0 +1,42 @@
+version: '{build}'
+
+environment:
+  GYP_MSVS_VERSION: 2013
+
+platform:
+  - Win32
+
+configuration:
+  - Debug
+  - Release
+
+# Use the source dir expected by gclient.
+clone_folder: c:\projects\breakpad\src
+
+# Before checkout.
+init:
+  - cd %APPVEYOR_BUILD_FOLDER%\..\..
+  - appveyor DownloadFile https://storage.googleapis.com/chrome-infra/depot_tools.zip
+  - 7z -bd x depot_tools.zip -odepot_tools
+  - depot_tools\update_depot_tools
+  - cd %APPVEYOR_BUILD_FOLDER%
+
+# After checkout.
+install:
+  - PATH C:\projects\depot_tools;%PATH%
+  - cd %APPVEYOR_BUILD_FOLDER%\..
+  - gclient config https://%APPVEYOR_REPO_PROVIDER%.com/%APPVEYOR_REPO_NAME% --unmanaged --name=src
+  - gclient sync
+
+build_script:
+  - cd %APPVEYOR_BUILD_FOLDER%
+  - msbuild src\client\windows\breakpad_client.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /m /verbosity:normal
+  - msbuild src\tools\windows\tools_windows.sln    /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /m /verbosity:normal
+
+test_script:
+  - src\client\windows\%CONFIGURATION%\client_tests.exe
+  - src\tools\windows\%CONFIGURATION%\dump_syms_unittest.exe
+
+artifacts:
+  - path: '**\*.exe'
+  - path: '**\*.lib'
@@ -0,0 +1,270 @@
+#! /bin/sh
+# Wrapper for Microsoft lib.exe
+
+me=ar-lib
+scriptversion=2012-03-01.08; # UTC
+
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# Written by Peter Rosin <[email protected]>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <[email protected]> or send patches to
+# <[email protected]>.
+
+
+# func_error message
+func_error ()
+{
+  echo "$me: $1" 1>&2
+  exit 1
+}
+
+file_conv=
+
+# func_file_conv build_file
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv in
+	mingw)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_at_file at_file operation archive
+# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE
+# for each of them.
+# When interpreting the content of the @FILE, do NOT use func_file_conv,
+# since the user would need to supply preconverted file names to
+# binutils ar, at least for MinGW.
+func_at_file ()
+{
+  operation=$2
+  archive=$3
+  at_file_contents=`cat "$1"`
+  eval set x "$at_file_contents"
+  shift
+
+  for member
+  do
+    $AR -NOLOGO $operation:"$member" "$archive" || exit $?
+  done
+}
+
+case $1 in
+  '')
+     func_error "no command.  Try '$0 --help' for more information."
+     ;;
+  -h | --h*)
+    cat <<EOF
+Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
+
+Members may be specified in a file named with @FILE.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "$me, version $scriptversion"
+    exit $?
+    ;;
+esac
+
+if test $# -lt 3; then
+  func_error "you must specify a program, an action and an archive"
+fi
+
+AR=$1
+shift
+while :
+do
+  if test $# -lt 2; then
+    func_error "you must specify a program, an action and an archive"
+  fi
+  case $1 in
+    -lib | -LIB \
+    | -ltcg | -LTCG \
+    | -machine* | -MACHINE* \
+    | -subsystem* | -SUBSYSTEM* \
+    | -verbose | -VERBOSE \
+    | -wx* | -WX* )
+      AR="$AR $1"
+      shift
+      ;;
+    *)
+      action=$1
+      shift
+      break
+      ;;
+  esac
+done
+orig_archive=$1
+shift
+func_file_conv "$orig_archive"
+archive=$file
+
+# strip leading dash in $action
+action=${action#-}
+
+delete=
+extract=
+list=
+quick=
+replace=
+index=
+create=
+
+while test -n "$action"
+do
+  case $action in
+    d*) delete=yes  ;;
+    x*) extract=yes ;;
+    t*) list=yes    ;;
+    q*) quick=yes   ;;
+    r*) replace=yes ;;
+    s*) index=yes   ;;
+    S*)             ;; # the index is always updated implicitly
+    c*) create=yes  ;;
+    u*)             ;; # TODO: don't ignore the update modifier
+    v*)             ;; # TODO: don't ignore the verbose modifier
+    *)
+      func_error "unknown action specified"
+      ;;
+  esac
+  action=${action#?}
+done
+
+case $delete$extract$list$quick$replace,$index in
+  yes,* | ,yes)
+    ;;
+  yesyes*)
+    func_error "more than one action specified"
+    ;;
+  *)
+    func_error "no action specified"
+    ;;
+esac
+
+if test -n "$delete"; then
+  if test ! -f "$orig_archive"; then
+    func_error "archive not found"
+  fi
+  for member
+  do
+    case $1 in
+      @*)
+        func_at_file "${1#@}" -REMOVE "$archive"
+        ;;
+      *)
+        func_file_conv "$1"
+        $AR -NOLOGO -REMOVE:"$file" "$archive" || exit $?
+        ;;
+    esac
+  done
+
+elif test -n "$extract"; then
+  if test ! -f "$orig_archive"; then
+    func_error "archive not found"
+  fi
+  if test $# -gt 0; then
+    for member
+    do
+      case $1 in
+        @*)
+          func_at_file "${1#@}" -EXTRACT "$archive"
+          ;;
+        *)
+          func_file_conv "$1"
+          $AR -NOLOGO -EXTRACT:"$file" "$archive" || exit $?
+          ;;
+      esac
+    done
+  else
+    $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member
+    do
+      $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
+    done
+  fi
+
+elif test -n "$quick$replace"; then
+  if test ! -f "$orig_archive"; then
+    if test -z "$create"; then
+      echo "$me: creating $orig_archive"
+    fi
+    orig_archive=
+  else
+    orig_archive=$archive
+  fi
+
+  for member
+  do
+    case $1 in
+    @*)
+      func_file_conv "${1#@}"
+      set x "$@" "@$file"
+      ;;
+    *)
+      func_file_conv "$1"
+      set x "$@" "$file"
+      ;;
+    esac
+    shift
+    shift
+  done
+
+  if test -n "$orig_archive"; then
+    $AR -NOLOGO -OUT:"$archive" "$orig_archive" "$@" || exit $?
+  else
+    $AR -NOLOGO -OUT:"$archive" "$@" || exit $?
+  fi
+
+elif test -n "$list"; then
+  if test ! -f "$orig_archive"; then
+    func_error "archive not found"
+  fi
+  $AR -NOLOGO -LIST "$archive" || exit $?
+fi
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey <[email protected]>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <[email protected]> or send patches to
+# <[email protected]>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <[email protected]>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
@@ -0,0 +1,791 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2013-05-30.07; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <[email protected]>.
+
+case $1 in
+  '')
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputting dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <[email protected]>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the "deleted header file" problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+## Some versions of gcc put a space before the ':'.  On the theory
+## that the space means something, we add a space to the output as
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like '#:fec' to the end of the
+    # dependency line.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  set_dir_from "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using '\' :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  set_dir_from  "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for ':'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+  "$@" $dashmflag |
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+        set fnord "$@"
+        shift
+        shift
+        ;;
+    *)
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
@@ -0,0 +1,501 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2013-12-25.23; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# 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
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# 'make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+tab='	'
+nl='
+'
+IFS=" $tab$nl"
+
+# Set DOITPROG to "echo" to test this script.
+
+doit=${DOITPROG-}
+doit_exec=${doit:-exec}
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+is_target_a_directory=possibly
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
+
+    -o) chowncmd="$chownprog $2"
+        shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
+
+    -T) is_target_a_directory=never;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --) shift
+        break;;
+
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call 'install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names problematic for 'test' and other utilities.
+  case $src in
+    -* | [=\(\)!]) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+    dst=$dst_arg
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      dstdir=`dirname "$dst"`
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *[2367][2367]) mkdir_umask=$umask;;
+          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+          *[0-7])
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac
+
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+        case $umask in
+          *[123567][0-7][0-7])
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+            if (umask $mkdir_umask &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+            then
+              if test -z "$dir_arg" || {
+                   # Check for POSIX incompatibilities with -m.
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+                   # other-writable bit of parent directory when it shouldn't.
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+                   case $ls_ld_tmpdir in
+                     d????-?r-*) different_mode=700;;
+                     d????-?--*) different_mode=755;;
+                     *) false;;
+                   esac &&
+                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/d" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
+      esac
+
+      oIFS=$IFS
+      IFS=/
+      set -f
+      set fnord $dstdir
+      shift
+      set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask=$mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       set +f &&
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2013-10-28.13; # UTC
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <[email protected]>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+
+case $1 in
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+
+Send bug reports to <[email protected]>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
@@ -0,0 +1,3 @@
+#!/bin/sh
+# -E to keep the environment variables needed to run the tests.
+exec sudo -E "$@"
				`@@ -0,0 +1 @@`
				`custom: ['https://utip.io/flyinghead', 'https://www.paypal.com/paypalme/FlycastEmu']`