Merge branch 'master' into research/latency-and-polling

.github/workflows/build_check.yml

@@ -0,0 +1,25 @@
+name: Build Check
+
+on:
+  push:
+    branches:
+      - "**"
+  pull_request:
+    branches:
+      - "**"
+
+jobs:  
+  ubuntu64:
+    name: "Build Check"
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: "Build"
+        if: success()
+        working-directory: ${{ github.workspace }}
+        run: |
+          sudo docker run --volume=${PWD}:/work --workdir=/work nikhilnarayana/devkitpro-slippi:latest make ini list
+      - uses: numtide/clean-git-action@v1

.gitignore

@@ -219,9 +219,14 @@ pip-log.txt
 
 .idea/
 
+.vscode
+
+Output/Console/install.bat
+Output/Console/install-core-only.bat
 Output/Netplay/install.bat
 Output/Netplay/build-netplay.bat - Shortcut.lnk
 Output/Playback/install.bat
 Output/Playback/build-playback.bat - Shortcut.lnk
+Output/Bootloader/build-bootloader.bat - Shortcut.lnk
 ./build-netplay0.sh
 ./netplay0.json

Bootloader/AddHeap.asm

@@ -0,0 +1,10 @@
+################################################################################
+# Address: 8015ff60
+################################################################################
+
+################################################################################
+# Description: adjusts the number of heaps from 4 to 6.
+# Slippi uses heap 5 and m-ex uses heap 6.
+################################################################################
+
+li	r4, 6

Bootloader/main.asm

@@ -13,6 +13,7 @@
 #     r5 = read (0x0) or write (0x1)
 ################################################################################
 .include "Common/Common.s"
+.include "Online/Online.s"
 
 .set  REG_HeapLo,31
 .set  REG_FileSize,28
@@ -62,7 +63,7 @@ backup
   rlwinm	REG_FileSize, REG_FileSize, 0, 0, 26
 #Create heap of this size
   add r4,REG_HeapLo,REG_FileSize     #heap hi = start + filesize
-  addi r4,r4, 32                     #heap hi, 32 bytes padding?
+  addi r4,r4,32+32+128                     #heap hi, 32 bytes per allocation? Also add space for file buffer
   mr  r3,REG_HeapLo                  #heap lo = start
   mr  REG_HeapLo,r4                  #new start = heap hi
   branchl r12,0x803440e8
@@ -100,6 +101,12 @@ backup
   mflr r4
   branchl r12, FN_ProcessGecko
 
+#Alloc from this heap
+  mr  r3,REG_HeapID
+  li  r4,128
+  branchl r12,0x80343ef0
+  stw r3,OFST_R13_SB_ADDR(r13)
+
   b Exit
 
 Callback_ProcessGeckoCode: