From beed82bb562af29e4912c88cd93a15abc6b2d49f Mon Sep 17 00:00:00 2001
From: Christian Prochaska <christian.prochaska@genode-labs.com>
Date: Tue, 8 May 2012 16:20:35 +0200
Subject: [PATCH] Enable Noux for x86_64

Fixes #199.
---
 ports/mk/noux.mk        |  2 +-
 ports/run/noux.run      | 11 ++++++++---
 ports/run/noux_bash.run | 11 ++++++++---
 ports/run/noux_fork.run |  6 +++---
 ports/run/noux_vim.run  |  6 +++---
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/ports/mk/noux.mk b/ports/mk/noux.mk
index 2aef46e24f..3b3312f169 100644
--- a/ports/mk/noux.mk
+++ b/ports/mk/noux.mk
@@ -40,7 +40,7 @@ PWD = $(shell pwd)
 #
 # Disable Noux on non-x86 architectures for now
 #
-REQUIRES += x86 32bit
+REQUIRES += x86
 
 #
 # Detect missing preparation of noux package
diff --git a/ports/run/noux.run b/ports/run/noux.run
index ec88448f8f..e99fcf3acb 100644
--- a/ports/run/noux.run
+++ b/ports/run/noux.run
@@ -1,5 +1,5 @@
-if {![have_spec x86_32]} {
-	puts "\nNoux is supported on the x86_32 architecture only\n"
+if {![have_spec x86]} {
+	puts "\nNoux is supported on the x86 architecture only\n"
 	exit 0
 }
 if {[have_spec linux]} {
@@ -34,7 +34,7 @@ install_config {
 			<any-service> <any-child/> <parent/> </any-service>
 		</default-route>
 		<start name="timer">
-			<resource name="RAM" quantum="512K"/>
+			<resource name="RAM" quantum="1M"/>
 			<provides><service name="Timer"/></provides>
 		</start>
 		<start name="uart_drv">
@@ -69,6 +69,11 @@ append qemu_args " -nographic"
 append qemu_args " -serial mon:stdio"
 append qemu_args " -serial file:$noux_output_file"
 
+if {[have_spec x86_64]} {
+        # coreutils.tar is really huge when built for x86_64
+        append qemu_args " -m 300 "
+}
+
 run_genode_until "child exited with exit value 0.*\n" 20
 
 puts "[exec cat $noux_output_file]"
diff --git a/ports/run/noux_bash.run b/ports/run/noux_bash.run
index f35548211e..d026e82cba 100644
--- a/ports/run/noux_bash.run
+++ b/ports/run/noux_bash.run
@@ -1,5 +1,5 @@
-if {![have_spec x86_32]} {
-	puts "\nNoux is supported on the x86_32 architecture only\n"
+if {![have_spec x86]} {
+	puts "\nNoux is supported on the x86 architecture only\n"
 	exit 0
 }
 
@@ -63,7 +63,7 @@ append config {
 			<any-service> <any-child/> <parent/> </any-service>
 		</default-route>
 		<start name="timer">
-			<resource name="RAM" quantum="512K"/>
+			<resource name="RAM" quantum="1M"/>
 			<provides><service name="Timer"/></provides>
 		</start> }
 
@@ -143,6 +143,11 @@ lappend_if [have_spec pl11x] boot_modules pl11x_drv
 
 build_boot_image $boot_modules
 
+if {[have_spec x86_64]} {
+	# bash.tar is really huge when built for x86_64
+	append qemu_args " -m 300 "
+}
+
 run_genode_until forever
 
 exec rm bin/bash.tar
diff --git a/ports/run/noux_fork.run b/ports/run/noux_fork.run
index e1a2e50b6a..58f1e126cf 100644
--- a/ports/run/noux_fork.run
+++ b/ports/run/noux_fork.run
@@ -1,5 +1,5 @@
-if {![have_spec x86_32]} {
-	puts "\nNoux is supported on the x86_32 architecture only\n"
+if {![have_spec x86]} {
+	puts "\nNoux is supported on the x86 architecture only\n"
 	exit 0
 }
 if {[have_spec linux]} {
@@ -33,7 +33,7 @@ install_config {
 			<any-service> <any-child/> <parent/> </any-service>
 		</default-route>
 		<start name="timer">
-			<resource name="RAM" quantum="512K"/>
+			<resource name="RAM" quantum="1M"/>
 			<provides><service name="Timer"/></provides>
 		</start>
 		<start name="uart_drv">
diff --git a/ports/run/noux_vim.run b/ports/run/noux_vim.run
index bc514e2f2c..351d72ceba 100644
--- a/ports/run/noux_vim.run
+++ b/ports/run/noux_vim.run
@@ -1,5 +1,5 @@
-if {![have_spec x86_32]} {
-	puts "\nNoux is supported on the x86_32 architecture only\n"
+if {![have_spec x86]} {
+	puts "\nNoux is supported on the x86 architecture only\n"
 	exit 0
 }
 
@@ -42,7 +42,7 @@ append config {
 			<any-service> <any-child/> <parent/> </any-service>
 		</default-route>
 		<start name="timer">
-			<resource name="RAM" quantum="512K"/>
+			<resource name="RAM" quantum="1M"/>
 			<provides><service name="Timer"/></provides>
 		</start> }