From 381edfadc6b1ed684565a62f2925a7443707a6a7 Mon Sep 17 00:00:00 2001
From: comex <comexk@gmail.com>
Date: Fri, 7 Jan 2011 22:01:46 -0500
Subject: [PATCH] catalog

---
 dmini.c                 | 15 ++++++++++-----
 make_kernel_patchfile.c |  3 +--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dmini.c b/dmini.c
index e0d472f..415f693 100644
--- a/dmini.c
+++ b/dmini.c
@@ -42,13 +42,18 @@ void find_second_ldm(struct binary *binary, uint32_t valid_conds, int reg, addr_
             }
 
             int offset;
-            if((val & 0xfdfc081) == 0x890c001) {
+            if((val & 0xfd0c081) == 0x890c001) {
                 offset = 0;
-            } else if((val & 0xfdfc081) == 0x990c001) {
+            } else if((val & 0xfd0c081) == 0x990c001) {
                 offset = 1;
             } else {
                 continue;
             }
+            
+            uint32_t rn = (val & 0xf0000) >> 16;
+            if((int) rn != reg) {
+                continue;
+            }
 
             *addrp = addr;
             *num_before_r0 = offset;
@@ -105,10 +110,10 @@ void find_kernel_ldm(struct binary *binary, uint32_t valid_conds, addr_t *addrp,
 
             // 0xfdf to be strict about user registers, 0xf9f otherwise
             int offset;
-            if((val & 0xfd0c080) == 0x890c000) {
+            if((val & 0xfd08080) == 0x8908000) {
                 // ldmia
                 offset = 0;
-            } else if((val & 0xfd0c080) == 0x990c000) {
+            } else if((val & 0xfd08080) == 0x9908000) {
                 // ldmib
                 offset = 1;
             } else {
@@ -119,7 +124,7 @@ void find_kernel_ldm(struct binary *binary, uint32_t valid_conds, addr_t *addrp,
             uint32_t reglist = val & 0x7f7f;
             int ones = count_ones(reglist) + offset; // ones = offset of PC
             
-            printf("addr=%x rn=%u ones=%d val=%x\n", addr, rn, ones, val);
+            //printf("addr=%x rn=%u ones=%d val=%x\n", addr, rn, ones, val);
             if(rn != 0 && rn != 5) goto nope;
 
             //printf("rn=%u ones=%d\n", rn, ones);
diff --git a/make_kernel_patchfile.c b/make_kernel_patchfile.c
index d81e806..4d2d04a 100644
--- a/make_kernel_patchfile.c
+++ b/make_kernel_patchfile.c
@@ -129,8 +129,7 @@ void do_kernel(prange_t output, prange_t sandbox, struct binary *binary) {
     addr_t sysent_patch_orig = b_read32(binary, sysent + 4);
     patch("sysent patch", 0, uint32_t, {sysent + 4});
     patch("sysent patch orig", 0, uint32_t, {sysent_patch_orig});
-
-    fprintf(stderr, "scratch = %x\n", scratch);
+    patch("scratch", 0, uint32_t, {(scratch + sandbox.size + 0xfff) & ~0xfff});
 }