9os

commit 34670bcdf693abf2e457cdae6759fc6920747efc
parent 085575ac98cb0ddcefbfbde0c6123dc4b1a5371f
Author: Roberto Vargas <roberto.vargas@arm.com>
Date:   Mon, 26 Nov 2018 09:59:34 +0000

[libk] Add support for z size specifier

Change-Id: I429cd96063000f78b3af8ee28e3c40263c3f032d

Diffstat:
M
src/libk/doprnt.c
 | 
7
++++++-
M
target/native/rom.c
 | 
20
++++++++++----------

2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/libk/doprnt.c b/src/libk/doprnt.c
@@ -64,8 +64,10 @@ getnum(va_list *va, int size)
 	case 2:
 		return va_arg(*va, long long);
 	case 3:
-	default:
 		return (long long) va_arg(*va, void *);
+	case 4:
+	default:
+		return va_arg(*va, size_t);
 	}
 }
 
@@ -91,6 +93,9 @@ flags:
 		case 'l':
 			size++;
 			goto flags;
+		case 'z':
+			size = 4;
+			goto flags;
 		case 'o':
 			base = 8;
 			goto print_number;
diff --git a/target/native/rom.c b/target/native/rom.c
@@ -96,17 +96,17 @@ static void
 info(Mach *mp)
 {
 	dbg("romfw: version %s\n"
-	    "txt = %p, txtsiz = 0x%llx\n"
-	    "ram = %p, ramsiz = 0x%llx\n"
-	    "bss = %p, bsssiz = 0x%llx\n"
-	    "env = %p, envsiz = 0x%llx\n"
-	    "sp = %p, stacksiz = 0x%llx\n",
+	    "ram = %p, ramsiz = 0x%zx\n"
+	    "txt = %p, txtsiz = 0x%zx\n"
+	    "env = %p, envsiz = 0x%zx\n"
+	    "bss = %p, bsssiz = 0x%zx, used = 0x%zx\n"
+	    "sp = %p, stacksiz = 0x%zx\n",
 	    RCODEVERSION,
-	    mp->txt,  (unsigned long long) mp->txtsiz,
-	    mp->ram,  (unsigned long long) mp->ramsiz,
-	    mp->bss_, (unsigned long long) mp->bsssiz,
-	    mp->env,  (unsigned long long) mp->envsiz,
-	    mp->sp,   (unsigned long long) mp->stacksiz);
+	    mp->ram, mp->ramsiz,
+	    mp->txt, mp->txtsiz,
+	    mp->env, mp->envsiz,
+	    mp->bss_, mp->bsssiz, bss->bsssize,
+	    mp->sp, mp->stacksiz);
 }
 
 void