Taking care of the warnings & added -Werror

Author: fl4tisjustice

include/skyline/nx/sf/cmif.h

@@ -92,7 +92,7 @@ typedef struct CmifResponse {
 } CmifResponse;
 
 NX_CONSTEXPR void* cmifGetAlignedDataStart(u32* data_words, void* base) {
-    intptr_t data_start = ((u8*)data_words - (u8*)base + 15) & ~15;
+    intptr_t data_start = ((u8*)(void*)data_words - (u8*)(void*)base + 15) & ~15;
     return (u8*)base + data_start;
 }
 

nso.mk

@@ -42,7 +42,7 @@ INCLUDES	:=	include libs/libeiffel/include
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIC -ftls-model=local-exec
 
-CFLAGS	:=	-g -Wall -ffunction-sections \
+CFLAGS	:=	-g -Wall -Werror -ffunction-sections \
 			$(ARCH) $(DEFINES)
 
 CFLAGS	+=	$(INCLUDE) -D__SWITCH__ -DCROSSVER=$(CROSSVER) 

source/RegionalDialect/Hook.cpp

@@ -235,7 +235,7 @@ uintptr_t FindPattern(const unsigned char* dataStart,
                       uintptr_t baseAddress, size_t offset, int occurrence) {
     // Build vectored pattern..
     vector<PatternByte> patterndata;
-    if (!TransformPattern(pszPattern, patterndata)) return NULL;
+    if (!TransformPattern(pszPattern, patterndata)) return 0;
 
     // The result count for multiple results..
     int resultCount = 0;
@@ -259,7 +259,7 @@ uintptr_t FindPattern(const unsigned char* dataStart,
         break;
     }
 
-    return NULL;
+    return 0;
 }
 
 uintptr_t SigScanRaw(const char *pattern, size_t offset, int occurrence) {
@@ -279,7 +279,7 @@ uintptr_t SigScanRaw(const char *pattern, size_t offset, int occurrence) {
     }
 
     skyline::logger::s_Instance->Log(" not found!\n");
-    return NULL;
+    return 0;
 }
 
 uintptr_t SigScan(const char* category, const char* sigName) {
@@ -318,7 +318,7 @@ std::vector<uintptr_t> SigScanExhaust(const char *category, const char *sigName)
 }
 
 
-std::vector<uintptr_t> SigScanArray(const char *category, const char *sigName, bool exhaust = false) {
+std::vector<uintptr_t> SigScanArray(const char *category, const char *sigName, bool exhaust) {
     auto ret = std::vector<uintptr_t>();
 
     if (!rd::config::config["gamedef"]["signatures"][category].has(sigName)){

source/RegionalDialect/Text.cpp

@@ -192,6 +192,7 @@ void processSc3TokenList(int xOffset, int yOffset,int lineLength,
                     break;
                 case 0x1E:
                     sc3string++;
+                    // [[fallthrough]];
                 case 0x1F:
                     sc3string++;
                     break;
@@ -349,17 +350,16 @@ void HandleTipsDataInit(ulong thread, unsigned short *addr1, unsigned short *add
 }
 
 void HandleMESsetNGflag(int nameNewline, int rubyEnabled) {
-
     auto isNGtop = [](unsigned short glyph)->bool {
-        for (int i = 0; i < *MESngFontListTopNumPtr; i++) {
+        for (uint32_t i = 0; i < *MESngFontListTopNumPtr; i++) {
             if (MESngFontListTop[i] == glyph)
                     return true;
         }
         return false;
     };
 
     auto isNGlast = [](unsigned short glyph)->bool {
-        for (int i = 0; i < *MESngFontListLastNumPtr; i++) {
+        for (uint32_t i = 0; i < *MESngFontListLastNumPtr; i++) {
             if (MESngFontListLast[i] == glyph)
                 return true;
         }
@@ -370,7 +370,7 @@ void HandleMESsetNGflag(int nameNewline, int rubyEnabled) {
         return glyph < 0x8000 && !isNGtop(glyph) && !isNGlast(glyph);
     };
 
-    auto nextWord = [&isLetter](int &pos)->void {
+    auto nextWord = [&isLetter](uint32_t &pos)->void {
         int wordLen = 0;
         while (pos < *MEStextDatNumPtr && isLetter(MEStext[pos])) {
             MEStextFl[pos] = wordLen == 0 ? 0x0A : 0x0B;
@@ -381,7 +381,7 @@ void HandleMESsetNGflag(int nameNewline, int rubyEnabled) {
 
 	int processingRuby = 0;
 	int processingRubyText = 0;
-    int pos = 0;
+    uint32_t pos = 0;
 
     const uint16_t nameStart = 0x8001;
     const uint16_t nameEnd = 0x8002;
@@ -451,12 +451,12 @@ void HandleMESsetNGflag(int nameNewline, int rubyEnabled) {
 
     int lastLetter = 0;
 
-    for (int i = 0; i < *MEStextDatNumPtr; i++) {
+    for (uint32_t i = 0; i < *MEStextDatNumPtr; i++) {
         if (MEStextFl[i] == 0x0B || MEStextFl[i] == 0x09) {
             lastLetter = i;
         }
     }
-    for (int i = lastLetter; i < *MEStextDatNumPtr; i++) {
+    for (uint32_t i = lastLetter; i < *MEStextDatNumPtr; i++) {
         if (MEStextFl[i] != 0x07) {
             MEStextFl[i] = 0x0B;
         }

source/skyline/inlinehook/And64InlineHook.cpp

@@ -496,8 +496,15 @@ static void __fix_instructions(uint32_t* __restrict inprw, uint32_t* __restrict
 #define __page_size PAGE_SIZE
 #define __page_align(n) __align_up(static_cast<uintptr_t>(n), __page_size)
 #define __ptr_align(x) __ptr(__align_down(reinterpret_cast<uintptr_t>(x), __page_size))
+
+#ifndef __align_up
 #define __align_up(x, n) (((x) + ((n)-1)) & ~((n)-1))
+#endif
+
+#ifndef __align_down
 #define __align_down(x, n) ((x) & -(n))
+#endif
+
 #define __countof(x) static_cast<intptr_t>(sizeof(x) / sizeof((x)[0]))  // must be signed
 #define __atomic_increase(p) __sync_add_and_fetch(p, 1)
 #define __sync_cmpswap(p, v, n) __sync_bool_compare_and_swap(p, v, n)

source/skyline/plugin/PluginManager.cpp

@@ -207,7 +207,7 @@ namespace plugin {
         const PluginInfo* ret = nullptr;
         for (auto& plugin : m_pluginInfos) {
             void* module_start = (void*)plugin.Module.ModuleObject->module_base;
-            void* module_end = module_start + plugin.Size;
+            void* module_end = (void*)((uintptr_t)module_start + (uintptr_t)plugin.Size);
             if (module_start < addr && addr < module_end) {
                 ret = &plugin;
                 break;
@@ -225,6 +225,6 @@ void get_plugin_addresses(const void* internal_addr, void** start, void** end) {
         *start = *end = nullptr;
     else {
         *start = (void*)info->Module.ModuleObject->module_base;
-        *end = *start + info->Size;
+        *end = (void*)((uintptr_t)*start + (uintptr_t)info->Size);
     }
 }