From patchwork Fri Jun 19 10:08:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Alrae X-Patchwork-Id: 486643 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E3D88140134 for ; Fri, 19 Jun 2015 20:13:13 +1000 (AEST) Received: from localhost ([::1]:57230 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5tIO-0000Vr-2I for incoming@patchwork.ozlabs.org; Fri, 19 Jun 2015 06:13:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5tEh-00033f-AV for qemu-devel@nongnu.org; Fri, 19 Jun 2015 06:09:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5tEg-0002uC-9O for qemu-devel@nongnu.org; Fri, 19 Jun 2015 06:09:23 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:64558) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5tEg-0002tl-46 for qemu-devel@nongnu.org; Fri, 19 Jun 2015 06:09:22 -0400 Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id 873DF4CAA8DC; Fri, 19 Jun 2015 11:09:18 +0100 (IST) Received: from lalrae-linux.kl.imgtec.org (192.168.14.163) by KLMAIL01.kl.imgtec.org (192.168.5.35) with Microsoft SMTP Server (TLS) id 14.3.195.1; Fri, 19 Jun 2015 11:09:20 +0100 From: Leon Alrae To: Date: Fri, 19 Jun 2015 11:08:44 +0100 Message-ID: <1434708524-25434-6-git-send-email-leon.alrae@imgtec.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1434708524-25434-1-git-send-email-leon.alrae@imgtec.com> References: <1434708524-25434-1-git-send-email-leon.alrae@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [192.168.14.163] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.59.15.196 Cc: matthew.fortune@imgtec.com, aurelien@aurel32.net Subject: [Qemu-devel] [PATCH v3 5/5] target-mips: convert host to MIPS errno values when required X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Convert only errno values which can be returned by system calls in mips-semi.c and are not generic to all archs. Signed-off-by: Leon Alrae Reviewed-by: Aurelien Jarno --- target-mips/mips-semi.c | 44 +++++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/target-mips/mips-semi.c b/target-mips/mips-semi.c index 6944e98..1162c76 100644 --- a/target-mips/mips-semi.c +++ b/target-mips/mips-semi.c @@ -72,6 +72,28 @@ enum UHIOpenFlags { UHIOpen_EXCL = 0x800 }; +/* Errno values taken from asm-mips/errno.h */ +static uint16_t host_to_mips_errno[] = { + [ENAMETOOLONG] = 78, +#ifdef EOVERFLOW + [EOVERFLOW] = 79, +#endif +#ifdef ELOOP + [ELOOP] = 90, +#endif +}; + +static int errno_mips(int err) +{ + if (err < 0 || err >= ARRAY_SIZE(host_to_mips_errno)) { + return EINVAL; + } else if (host_to_mips_errno[err]) { + return host_to_mips_errno[err]; + } else { + return err; + } +} + static int copy_stat_to_target(CPUMIPSState *env, const struct stat *src, target_ulong vaddr) { @@ -223,7 +245,7 @@ void helper_do_semihosting(CPUMIPSState *env) gpr[2] = 2; } else { gpr[2] = open(p, get_open_flags(gpr[5]), gpr[6]); - gpr[3] = errno; + gpr[3] = errno_mips(errno); } FREE_TARGET_STRING(p, gpr[4]); break; @@ -234,24 +256,24 @@ void helper_do_semihosting(CPUMIPSState *env) goto uhi_done; } gpr[2] = close(gpr[4]); - gpr[3] = errno; + gpr[3] = errno_mips(errno); break; case UHI_read: gpr[2] = read_from_file(env, gpr[4], gpr[5], gpr[6], 0); - gpr[3] = errno; + gpr[3] = errno_mips(errno); break; case UHI_write: gpr[2] = write_to_file(env, gpr[4], gpr[5], gpr[6], 0); - gpr[3] = errno; + gpr[3] = errno_mips(errno); break; case UHI_lseek: gpr[2] = lseek(gpr[4], gpr[5], gpr[6]); - gpr[3] = errno; + gpr[3] = errno_mips(errno); break; case UHI_unlink: GET_TARGET_STRING(p, gpr[4]); gpr[2] = remove(p); - gpr[3] = errno; + gpr[3] = errno_mips(errno); FREE_TARGET_STRING(p, gpr[4]); break; case UHI_fstat: @@ -259,12 +281,12 @@ void helper_do_semihosting(CPUMIPSState *env) struct stat sbuf; memset(&sbuf, 0, sizeof(sbuf)); gpr[2] = fstat(gpr[4], &sbuf); - gpr[3] = errno; + gpr[3] = errno_mips(errno); if (gpr[2]) { goto uhi_done; } gpr[2] = copy_stat_to_target(env, &sbuf, gpr[5]); - gpr[3] = errno; + gpr[3] = errno_mips(errno); } break; case UHI_argc: @@ -311,18 +333,18 @@ void helper_do_semihosting(CPUMIPSState *env) break; case UHI_pread: gpr[2] = read_from_file(env, gpr[4], gpr[5], gpr[6], gpr[7]); - gpr[3] = errno; + gpr[3] = errno_mips(errno); break; case UHI_pwrite: gpr[2] = write_to_file(env, gpr[4], gpr[5], gpr[6], gpr[7]); - gpr[3] = errno; + gpr[3] = errno_mips(errno); break; #ifndef _WIN32 case UHI_link: GET_TARGET_STRING(p, gpr[4]); GET_TARGET_STRING(p2, gpr[5]); gpr[2] = link(p, p2); - gpr[3] = errno; + gpr[3] = errno_mips(errno); FREE_TARGET_STRING(p2, gpr[5]); FREE_TARGET_STRING(p, gpr[4]); break;