main/mbar: complete hex2decPlMi match

Author: raphaelthegreat

config/p3.jul12.symbol_addrs.txt

@@ -2402,6 +2402,7 @@ exit                                = 0x00169730; // type:func
 __fixsfdi                           = 0x00169760; // type:func
 __floatdisf                         = 0x00169a20; // type:func
 __muldi3                            = 0x0016a168; // type:func
+__moddi3                            = 0x00169b00; // type:func
 __udivdi3                           = 0x0016a1c8; // type:func
 __umoddi3                           = 0x0016a798; // type:func
 

progress/report.json

@@ -1,15 +1,15 @@
 {
   "measures": {
-    "fuzzy_match_percent": 48.65813,
+    "fuzzy_match_percent": 48.71773,
     "total_code": "342284",
-    "matched_code": "163360",
-    "matched_code_percent": 47.726448,
+    "matched_code": "163564",
+    "matched_code_percent": 47.78605,
     "total_data": "26082796",
     "matched_data": "26033144",
     "matched_data_percent": 99.80963,
     "total_functions": 1429,
-    "matched_functions": 1003,
-    "matched_functions_percent": 70.18894,
+    "matched_functions": 1004,
+    "matched_functions_percent": 70.25892,
     "total_units": 70
   },
   "units": [
@@ -3966,14 +3966,14 @@
     {
       "name": "main/mbar",
       "measures": {
-        "fuzzy_match_percent": 54.849854,
+        "fuzzy_match_percent": 56.205154,
         "total_code": "15052",
-        "matched_code": "8256",
-        "matched_code_percent": 54.84985,
+        "matched_code": "8460",
+        "matched_code_percent": 56.205154,
         "total_data": "224",
         "total_functions": 82,
-        "matched_functions": 64,
-        "matched_functions_percent": 78.048775,
+        "matched_functions": 65,
+        "matched_functions_percent": 79.268295,
         "total_units": 1
       },
       "sections": [
@@ -3995,7 +3995,7 @@
         {
           "name": ".text",
           "size": "15208",
-          "fuzzy_match_percent": 54.849854,
+          "fuzzy_match_percent": 56.205154,
           "metadata": {}
         }
       ],
@@ -4260,6 +4260,7 @@
         {
           "name": "hex2decPlMi",
           "size": "204",
+          "fuzzy_match_percent": 100.0,
           "metadata": {},
           "address": "5368"
         },
@@ -13211,16 +13212,16 @@
     {
       "id": "main",
       "measures": {
-        "fuzzy_match_percent": 66.531494,
+        "fuzzy_match_percent": 66.69596,
         "total_code": "124036",
-        "matched_code": "81680",
-        "matched_code_percent": 65.85185,
+        "matched_code": "81884",
+        "matched_code_percent": 66.01632,
         "total_data": "66144",
         "matched_data": "56300",
         "matched_data_percent": 85.117325,
         "total_functions": 570,
-        "matched_functions": 495,
-        "matched_functions_percent": 86.84211,
+        "matched_functions": 496,
+        "matched_functions_percent": 87.01754,
         "total_units": 17
       }
     },

src/main/mbar.c

@@ -644,9 +644,6 @@ static void ExamDispOn(void) {
 
 INCLUDE_ASM("asm/nonmatchings/main/mbar", hex2dec_mbar_tmp);
 
-#ifndef NON_MATCHING
-INCLUDE_ASM("asm/nonmatchings/main/mbar", hex2decPlMi);
-#else 
 static u_long hex2decPlMi(long data) {
 	u_long ret;
 	int i;
@@ -658,17 +655,24 @@ static u_long hex2decPlMi(long data) {
     }
     plmichar = data < 1 ? 0 : 10;
     if (data < 0) {
-        plmichar = 11;
         data *= -1;
+        plmichar = 11;
     }
-    for (i = 0; i < 16u && data; i++) {
-        ret |= (data % 10) << (i * 4);
-        data /= 10;
+    i = 0;
+    if (data == 0) {
+        ret = plmichar;
+    } else {
+        while (data) {
+            ret |= (data % 10) << (i * 4);
+            data /= 10;
+            if (++i >= 16u) {
+                return ret;
+            }
+        }
+        ret |= plmichar << (i * 4);
     }
-    ret |= plmichar << (i * 4);
     return ret;
 }
-#endif
 
 void examNumDisp(sceGifPacket *ex_gif_pp, long score, short x, short y, int keta, u_char *coldat_pp, int plmi) {
 	int i;