Fix #83, Unaligned #81

ExistOS-Team · Nov 20, 2022 · b74c635 · b74c635
1 parent 7995d65
commit b74c635
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -75,4 +75,6 @@ elftosb
 sbloader
 elftosb1
 rsrctool
-sbtoelf
+sbtoelf
+edb
+sysigner
diff --git a/OSLoader/CMakeLists.txt b/OSLoader/CMakeLists.txt
@@ -107,22 +107,6 @@ add_custom_target(
   COMMAND ${CMAKE_SOURCE_DIR}/tools/sbtools_win/sb_loader -f ${CMAKE_CURRENT_BINARY_DIR}/OSLoader.sb 
   DEPENDS OSLoader.sb
   )
-
-add_custom_target(
-    edb_flash_loader 
-    COMMAND ${CMAKE_SOURCE_DIR}/tools/edb -r -s -f ${CMAKE_CURRENT_BINARY_DIR}/OSLoader.sb 1408 b
-    DEPENDS OSLoader.sb
-    )
-
-add_custom_target(
-      mscmode 
-      COMMAND ${CMAKE_SOURCE_DIR}/tools/edb -m
-      )
-
-add_custom_target(
-    reboot 
-    COMMAND ${CMAKE_SOURCE_DIR}/tools/edb -r
-    )
 else()
 if(EXISTS ${CMAKE_SOURCE_DIR}/tools/sbtools/  )
 add_custom_target(
@@ -140,3 +124,18 @@ message(FATAL_ERROR "Please build tools/sbtools first")
 endif(EXISTS ${CMAKE_SOURCE_DIR}/tools/sbtools/elftosb)
 endif()
 
+add_custom_target(
+    edb_flash_loader 
+    COMMAND ${CMAKE_SOURCE_DIR}/tools/edb -r -s -f ${CMAKE_CURRENT_BINARY_DIR}/OSLoader.sb 1408 b
+    DEPENDS OSLoader.sb
+    )
+
+add_custom_target(
+      mscmode 
+      COMMAND ${CMAKE_SOURCE_DIR}/tools/edb -m
+      )
+
+add_custom_target(
+    reboot 
+    COMMAND ${CMAKE_SOURCE_DIR}/tools/edb -r
+    )
diff --git a/OSLoader/VmMgr/vmMgr.c b/OSLoader/VmMgr/vmMgr.c
@@ -154,8 +154,8 @@ static inline __attribute__((target("thumb"))) CachePageInfo_t *search_cache_pag
 }
 
 #if USE_TINY_PAGE
-static uint8_t page_save_wr_buf[2048] __attribute__((aligned(4096)));
-static uint8_t page_save_rd_buf[2048] __attribute__((aligned(4096)));
+static uint8_t page_save_wr_buf[2048]; // __attribute__((aligned(4096)));
+static uint8_t page_save_rd_buf[2048]; // __attribute__((aligned(4096)));
 static uint32_t pagebuf_last_rd = 0xFFFFFFFF;
 #endif
 

diff --git a/System/kcasporing_gl.c b/System/kcasporing_gl.c
@@ -178,6 +178,7 @@ void vGL_putString(int x0, int y0, char *s, int fg, int bg, int fontSize) {
                 if (y > VIR_LCD_PIX_H) {
                     break;
                 }
+                break;
             }
         }
     }