Module Name: src
Committed By: christos
Date: Thu Feb 16 02:34:56 UTC 2012
Modified Files:
src/sys/arch/arm/arm: disassem.c
Log Message:
cast printf so it can be used from userland, and include the proper include
files for userland if not kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/arm/disassem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/disassem.c
diff -u src/sys/arch/arm/arm/disassem.c:1.18 src/sys/arch/arm/arm/disassem.c:1.19
--- src/sys/arch/arm/arm/disassem.c:1.18 Sun Apr 27 14:58:43 2008
+++ src/sys/arch/arm/arm/disassem.c Wed Feb 15 21:34:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disassem.c,v 1.18 2008/04/27 18:58:43 matt Exp $ */
+/* $NetBSD: disassem.c,v 1.19 2012/02/16 02:34:56 christos Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe.
@@ -49,10 +49,14 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.18 2008/04/27 18:58:43 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.19 2012/02/16 02:34:56 christos Exp $");
#include <sys/systm.h>
#include <arch/arm/arm/disassem.h>
+#ifndef _KERNEL
+#include <stdio.h>
+#include <arm/armreg.h>
+#endif
/*
* General instruction format
@@ -680,7 +684,8 @@ disassemble_printaddr(u_int address)
}
static const disasm_interface_t disassemble_di = {
- disassemble_readword, disassemble_printaddr, printf
+ disassemble_readword, disassemble_printaddr,
+ (void (*)(const char *, ...))printf
};
void