Merge branch 'master' of https://gitee.com/openLuat/LuatOS

openLuat · Apr 28, 2024 · acde7a4 · acde7a4
2 parents 2102d97 + cfe1f7b
commit acde7a4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/components/fastlz/fastlz.c b/components/fastlz/fastlz.c
@@ -25,8 +25,8 @@
 
 #include <stdint.h>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+// #pragma GCC diagnostic push
+// #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
 
 /*
  * Give hints to the compiler for branch prediction optimization.
@@ -500,4 +500,4 @@ int fastlz_compress_level(int level, const void* input, int length, void* output
   return 0;
 }
 
-#pragma GCC diagnostic pop
+// #pragma GCC diagnostic pop
diff --git a/components/mempool/tlsf3/tlsf.c b/components/mempool/tlsf3/tlsf.c
@@ -1295,4 +1295,5 @@ int tlsf_stat(pool_t pool, size_t *total, size_t *used, size_t *maxused) {
     *total = ctx.total;
     *used = ctx.used;
 	*maxused = ctx.used;
+	return 0;
 }
diff --git a/components/nes/src/nes_cpu.c b/components/nes/src/nes_cpu.c
@@ -100,7 +100,7 @@ static inline const uint8_t* nes_get_dma_address(nes_t* nes,uint8_t data) {
     //     return famicom->save_ram + ((uint16_t)(data & 0x1f) << 8);
     case 4: case 5: case 6: case 7:
         // 高一位为1, [$8000, $10000) 程序PRG-ROM区
-        return nes->nes_cpu.prg_banks[data >> 4] + ((uint16_t)(data & 0x0f) << 8);
+        return nes->nes_cpu.prg_banks[(data >> 4) & 0x3] + ((uint16_t)(data & 0x0f) << 8);
     }
 }