From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1K1eZg-0004f4-BC for qemu-devel@nongnu.org; Thu, 29 May 2008 05:37:32 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1K1eZf-0004eA-Bu for qemu-devel@nongnu.org; Thu, 29 May 2008 05:37:31 -0400 Received: from [199.232.76.173] (port=56936 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1K1eZe-0004di-4F for qemu-devel@nongnu.org; Thu, 29 May 2008 05:37:30 -0400 Received: from savannah.gnu.org ([199.232.41.3]:46450 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1K1eZd-0007Ul-3I for qemu-devel@nongnu.org; Thu, 29 May 2008 05:37:29 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1K1eYA-0001bT-Br for qemu-devel@nongnu.org; Thu, 29 May 2008 09:35:58 +0000 Received: from bellard by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1K1eYA-0001bP-4t for qemu-devel@nongnu.org; Thu, 29 May 2008 09:35:58 +0000 MIME-Version: 1.0 Errors-To: bellard Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Fabrice Bellard Message-Id: Date: Thu, 29 May 2008 09:35:58 +0000 Subject: [Qemu-devel] [4611] keep static code gen buffer for user mode - mark user mode reserved pages after all big allocations Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 4611 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4611 Author: bellard Date: 2008-05-29 09:35:57 +0000 (Thu, 29 May 2008) Log Message: ----------- keep static code gen buffer for user mode - mark user mode reserved pages after all big allocations Modified Paths: -------------- trunk/exec.c Modified: trunk/exec.c =================================================================== --- trunk/exec.c 2008-05-29 00:20:44 UTC (rev 4610) +++ trunk/exec.c 2008-05-29 09:35:57 UTC (rev 4611) @@ -187,14 +187,15 @@ #else static void map_exec(void *addr, long size) { - unsigned long start, end; + unsigned long start, end, page_size; + page_size = getpagesize(); start = (unsigned long)addr; - start &= ~(qemu_real_host_page_size - 1); + start &= ~(page_size - 1); end = (unsigned long)addr + size; - end += qemu_real_host_page_size - 1; - end &= ~(qemu_real_host_page_size - 1); + end += page_size - 1; + end &= ~(page_size - 1); mprotect((void *)start, end - start, PROT_READ | PROT_WRITE | PROT_EXEC); @@ -326,12 +327,34 @@ target_ulong vaddr); #endif +#define DEFAULT_CODE_GEN_BUFFER_SIZE (32 * 1024 * 1024) + +#if defined(CONFIG_USER_ONLY) +/* Currently it is not recommanded to allocate big chunks of data in + user mode. It will change when a dedicated libc will be used */ +#define USE_STATIC_CODE_GEN_BUFFER +#endif + +#ifdef USE_STATIC_CODE_GEN_BUFFER +static uint8_t static_code_gen_buffer[DEFAULT_CODE_GEN_BUFFER_SIZE]; +#endif + void code_gen_alloc(unsigned long tb_size) { +#ifdef USE_STATIC_CODE_GEN_BUFFER + code_gen_buffer = static_code_gen_buffer; + code_gen_buffer_size = DEFAULT_CODE_GEN_BUFFER_SIZE; + map_exec(code_gen_buffer, code_gen_buffer_size); +#else code_gen_buffer_size = tb_size; if (code_gen_buffer_size == 0) { +#if defined(CONFIG_USER_ONLY) + /* in user mode, phys_ram_size is not meaningful */ + code_gen_buffer_size = DEFAULT_CODE_GEN_BUFFER_SIZE; +#else /* XXX: needs ajustments */ code_gen_buffer_size = (int)(phys_ram_size / 4); +#endif } if (code_gen_buffer_size < MIN_CODE_GEN_BUFFER_SIZE) code_gen_buffer_size = MIN_CODE_GEN_BUFFER_SIZE; @@ -363,6 +386,7 @@ } map_exec(code_gen_buffer, code_gen_buffer_size); #endif +#endif /* !USE_STATIC_CODE_GEN_BUFFER */ map_exec(code_gen_prologue, sizeof(code_gen_prologue)); code_gen_buffer_max_size = code_gen_buffer_size - code_gen_max_block_size(); @@ -375,10 +399,10 @@ size. */ void cpu_exec_init_all(unsigned long tb_size) { - page_init(); cpu_gen_init(); code_gen_alloc(tb_size); code_gen_ptr = code_gen_buffer; + page_init(); io_mem_init(); }