Signed-off-by: Vegard Nossum <vegard.nos...@gmail.com>
---
arch/x86/init.c | 3 +++
vm/jato.c | 9 ---------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/arch/x86/init.c b/arch/x86/init.c
index 5353f70..25b2e1a 100644
--- a/arch/x86/init.c
+++ b/arch/x86/init.c
@@ -1,6 +1,7 @@
#include <stdbool.h>
#include "arch/init.h"
+#include "arch/instruction.h"
#include "vm/die.h"
unsigned long x86_cpu_features;
@@ -31,6 +32,8 @@ static void init_cpu_features(void)
void arch_init(void)
{
+ insn_sanity_check();
+
init_cpu_features();
if (!cpu_has(X86_FEATURE_SSE))
diff --git a/vm/jato.c b/vm/jato.c
index 1a00d3e..566e275 100644
--- a/vm/jato.c
+++ b/vm/jato.c
@@ -1149,12 +1149,6 @@ do_method_trace(void)
return 0;
}
-/* XXX: This should probably be in arch headers, BUT: it's only used in one
- * place _anyway_ (namely here), and we can't include arch headers here
- * because our register definitions conflict with the system header
- * ucontext.h. */
-void insn_sanity_check(void);
-
int
main(int argc, char *argv[])
{
@@ -1170,9 +1164,6 @@ main(int argc, char *argv[])
arch_init();
- /* Sanity checks first of all. */
- insn_sanity_check();
-
parse_options(argc, argv);
init_system_properties();
--
1.6.0.6
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Jatovm-devel mailing list
Jatovm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jatovm-devel
