From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KwDNZ-0005vN-MY for qemu-devel@nongnu.org; Sat, 01 Nov 2008 06:06:49 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KwDNY-0005to-PK for qemu-devel@nongnu.org; Sat, 01 Nov 2008 06:06:49 -0400 Received: from [199.232.76.173] (port=45329 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KwDNY-0005tX-G9 for qemu-devel@nongnu.org; Sat, 01 Nov 2008 06:06:48 -0400 Received: from ey-out-1920.google.com ([74.125.78.148]:24825) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KwDNY-0003BV-3d for qemu-devel@nongnu.org; Sat, 01 Nov 2008 06:06:48 -0400 Received: by ey-out-1920.google.com with SMTP id 4so582459eyk.4 for ; Sat, 01 Nov 2008 03:06:46 -0700 (PDT) From: "Kirill A. Shutemov" Date: Sat, 1 Nov 2008 12:06:43 +0200 Message-Id: <1225534003-3182-1-git-send-email-kirill@shutemov.name> In-Reply-To: <1224225264-8483-2-git-send-email-kirill@shutemov.name> References: <1224225264-8483-2-git-send-email-kirill@shutemov.name> Subject: [Qemu-devel] [PATCH, v2] linux-user, x86: use target_mmap() to allocate idt, gdt and ldt tables 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 Cc: "Kirill A. Shutemov" env->*dt.base should fits target address space, so we should use target_mmap to allocate it. Signed-off-by: Kirill A. Shutemov --- linux-user/main.c | 23 +++++++++++++++-------- linux-user/syscall.c | 10 ++++++---- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 72df96e..45104a2 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "qemu.h" #include "qemu-common.h" @@ -283,9 +284,8 @@ static void write_dt(void *ptr, unsigned long addr, unsigned long limit, p[1] = tswap32(e2); } +static uint64_t *idt_table; #ifdef TARGET_X86_64 -static uint64_t idt_table[512]; - static void set_gate64(void *ptr, unsigned int type, unsigned int dpl, uint64_t addr, unsigned int sel) { @@ -304,8 +304,6 @@ static void set_idt(int n, unsigned int dpl) set_gate64(idt_table + n * 2, 0, dpl, 0, 0); } #else -static uint64_t idt_table[256]; - static void set_gate(void *ptr, unsigned int type, unsigned int dpl, uint32_t addr, unsigned int sel) { @@ -2500,8 +2498,15 @@ int main(int argc, char **argv, char **envp) #endif /* linux interrupt setup */ - env->idt.base = h2g(idt_table); - env->idt.limit = sizeof(idt_table) - 1; +#ifndef TARGET_ABI32 + env->idt.limit = 511; +#else + env->idt.limit = 255; +#endif + env->idt.base = target_mmap(0, sizeof(uint64_t) * (env->idt.limit + 1), + PROT_READ|PROT_WRITE, + MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); + idt_table = g2h(env->idt.base); set_idt(0, 0); set_idt(1, 0); set_idt(2, 0); @@ -2527,9 +2532,11 @@ int main(int argc, char **argv, char **envp) /* linux segment setup */ { uint64_t *gdt_table; - gdt_table = qemu_mallocz(sizeof(uint64_t) * TARGET_GDT_ENTRIES); - env->gdt.base = h2g((unsigned long)gdt_table); + env->gdt.base = target_mmap(0, sizeof(uint64_t) * TARGET_GDT_ENTRIES, + PROT_READ|PROT_WRITE, + MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); env->gdt.limit = sizeof(uint64_t) * TARGET_GDT_ENTRIES - 1; + gdt_table = g2h(env->gdt.base); #ifdef TARGET_ABI32 write_dt(&gdt_table[__USER_CS >> 3], 0, 0xfffff, DESC_G_MASK | DESC_B_MASK | DESC_P_MASK | DESC_S_MASK | diff --git a/linux-user/syscall.c b/linux-user/syscall.c index effafb6..4ec8d0b 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -2824,12 +2824,14 @@ static abi_long write_ldt(CPUX86State *env, } /* allocate the LDT */ if (!ldt_table) { - ldt_table = malloc(TARGET_LDT_ENTRIES * TARGET_LDT_ENTRY_SIZE); - if (!ldt_table) + env->ldt.base = target_mmap(0, TARGET_LDT_ENTRIES * TARGET_LDT_ENTRY_SIZE, + PROT_READ|PROT_WRITE, + MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); + if (env->ldt.base == -1) return -TARGET_ENOMEM; - memset(ldt_table, 0, TARGET_LDT_ENTRIES * TARGET_LDT_ENTRY_SIZE); - env->ldt.base = h2g((unsigned long)ldt_table); + memset(g2h(env->ldt.base), 0, TARGET_LDT_ENTRIES * TARGET_LDT_ENTRY_SIZE); env->ldt.limit = 0xffff; + ldt_table = g2h(env->ldt.base); } /* NOTE: same code as Linux kernel */ -- 1.6.0.2.GIT