From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4201 invoked by alias); 24 Feb 2011 17:51:30 -0000 Received: (qmail 4191 invoked by uid 22791); 24 Feb 2011 17:51:29 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,TW_CP,TW_WT,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 24 Feb 2011 17:51:24 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id D1D282BAD08; Thu, 24 Feb 2011 12:51:22 -0500 (EST) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 7OZ8UgM1QTNM; Thu, 24 Feb 2011 12:51:22 -0500 (EST) Received: from kwai.gnat.com (kwai.gnat.com [205.232.38.4]) by rock.gnat.com (Postfix) with ESMTP id BE8F72BAC9F; Thu, 24 Feb 2011 12:51:22 -0500 (EST) Received: by kwai.gnat.com (Postfix, from userid 4233) id BCEA294677; Thu, 24 Feb 2011 12:51:22 -0500 (EST) From: Joel Brobecker To: gdb-patches@sourceware.org Cc: Joel Brobecker Subject: [PATCH 06/18] New module remote-wtx-utils Date: Thu, 24 Feb 2011 17:54:00 -0000 Message-Id: <1298569763-18784-7-git-send-email-brobecker@adacore.com> In-Reply-To: <1298569763-18784-1-git-send-email-brobecker@adacore.com> References: <1298569763-18784-1-git-send-email-brobecker@adacore.com> Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-02/txt/msg00702.txt.bz2 This module provides a couple of routines to deal with loading the VxWorks host-side shared libraries, such as the WTX library for instance. I rewrote a bit the routines to depend on two functions gdb_dlopen and gdb_dlsym which we could isolate in its own gdb_dlfcn.h/c if we wanted to. But since this is used only when adding the vxworks target, I kept these routines local for now - otherwise, it opens the door for questions such as: What do we do when these are not defined? Should we fail the configure even though chances are these routines might not be actually needed for the build? Or do we fail the configure only when they are in fact needed (ideal, but harder to maintain I believe), or do we just fail at link time (a bit ugly but much easier to implement)? For now, I don't think we really need to answer these questions, but I wrote the code in a way that it makes it easy to extract the code and create the module if we ever need to. gdb/ChangeLog: * remote-wtx-utils.h, remote-wtx-utils.c: New files. --- gdb/remote-wtx-utils.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++ gdb/remote-wtx-utils.h | 27 +++++++++++++ 2 files changed, 129 insertions(+), 0 deletions(-) create mode 100644 gdb/remote-wtx-utils.c create mode 100644 gdb/remote-wtx-utils.h diff --git a/gdb/remote-wtx-utils.c b/gdb/remote-wtx-utils.c new file mode 100644 index 0000000..728ff6b --- /dev/null +++ b/gdb/remote-wtx-utils.c @@ -0,0 +1,102 @@ +/* Support for the WTX protocol. + + Copyright (C) 2007, 2010, 2011 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include "defs.h" +#include "remote-wtx-utils.h" +#include "gdb_string.h" +#include "filenames.h" +#ifdef HAVE_LIBDL +#include +#elif __MINGW32__ +#include +#else +/* Unsupported configuration. See load_shared_lib for details. */ +#error +#endif + +/* Load the dynamic library file named FILENAME, and return a handle + for that dynamic library. Return NULL if the loading fails for + any reason. */ + +static void * +gdb_dlopen (const char *filename) +{ +#ifdef HAVE_LIBDL + return dlopen (filename, RTLD_NOW); +#elif __MINGW32__ + return (void *) LoadLibrary (filename); +#endif +} + +/* Return the address of the symbol named SYMBOL inside the shared library + whose handle is HANDLE. Return NULL when the symbol could not be found. */ + +static void * +gdb_dlsym(void *handle, const char *symbol) +{ +#ifdef HAVE_LIBDL + return dlsym (handle, symbol); +#elif __MINGW32__ + return (void *) GetProcAddress (handle, symbol); +#endif +} + +/* Load the shared library whose name is LIB_NAME and return a handle + on it. Return NULL if the library could not be loaded. + + Note that this name correspond to a different file name depending on + the host; for example, the name "wtxapi40" would identify libwtxapi40.so + on linux and solaris, whereas it would identify wtxapi40.dll. */ + +void * +load_shared_lib (char *lib_name) +{ + const char dos_suffix [] = ".dll"; + const char unix_prefix[] = "lib"; + const char unix_suffix [] = ".so"; + char *filename; + + if (have_dos_based_filesystem ()) + { + filename = (char *) alloca (strlen (lib_name) + strlen (dos_suffix) + 1); + strcpy (filename, lib_name); + strcat (filename, dos_suffix); + } + else + { + filename = (char *) alloca (strlen (unix_prefix) + + strlen (lib_name) + + strlen (unix_suffix) + 1); + strcpy (filename, unix_prefix); + strcat (filename, lib_name); + strcat (filename, unix_suffix); + } + + return gdb_dlopen (filename); +} + +/* Get the address of SYMBOL in a shared library identified + by HANDLE (HANDLE is the value returned by load_shared_lib + for this library). */ + +void * +get_symbol_from_shared_lib (void *handle, char *symbol) +{ + return gdb_dlsym (handle, symbol); +} diff --git a/gdb/remote-wtx-utils.h b/gdb/remote-wtx-utils.h new file mode 100644 index 0000000..0c96e8e --- /dev/null +++ b/gdb/remote-wtx-utils.h @@ -0,0 +1,27 @@ +/* Support for the WTX protocol. + + Copyright (C) 2007, 2010, 2011 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef REMOTE_WTX_UTILS_H +#define REMOTE_WTX_UTILS_H + +void *load_shared_lib (char *lib_name); + +void *get_symbol_from_shared_lib (void *handle, char *symbol); + +#endif -- 1.7.0.4