50e9d0df51
This patch changes how the embedded swig code is loaded to ensure that gem5 works with swig 3.0.9. For Python 2.7 and above, swig 3.0.9 now relies on importlib, and actually looks in the appropriate packages, even for the wrapped C code. However, the swig wrapper does not explicitly place the module in the right package (it just calls Py_InitModule), and we have to take explicit action to ensure that the swig code can be loaded. This patch adds the information to the generated wrappers and the appropriate calls to set the context as part of the swig initialisation. Previous versions of swig used to fall back on looking in the global namespace for the wrappers (and still do for Python 2.6), but technically things should not work without the functionality in this patch.
87 lines
2.7 KiB
C++
87 lines
2.7 KiB
C++
/*
|
|
* Copyright (c) 2008 The Hewlett-Packard Development Company
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met: redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer;
|
|
* redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution;
|
|
* neither the name of the copyright holders nor the names of its
|
|
* contributors may be used to endorse or promote products derived from
|
|
* this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* Authors: Nathan Binkert
|
|
*/
|
|
|
|
#ifndef __SIM_INIT_HH__
|
|
#define __SIM_INIT_HH__
|
|
|
|
#include <Python.h>
|
|
|
|
#include <list>
|
|
#include <string>
|
|
|
|
#include <inttypes.h>
|
|
|
|
#ifndef PyObject_HEAD
|
|
struct _object;
|
|
typedef _object PyObject;
|
|
#endif
|
|
|
|
/*
|
|
* Data structure describing an embedded python file.
|
|
*/
|
|
struct EmbeddedPython
|
|
{
|
|
const char *filename;
|
|
const char *abspath;
|
|
const char *modpath;
|
|
const uint8_t *code;
|
|
int zlen;
|
|
int len;
|
|
|
|
EmbeddedPython(const char *filename, const char *abspath,
|
|
const char *modpath, const uint8_t *code, int zlen, int len);
|
|
|
|
PyObject *getCode() const;
|
|
bool addModule() const;
|
|
|
|
static EmbeddedPython *importer;
|
|
static PyObject *importerModule;
|
|
static std::list<EmbeddedPython *> &getList();
|
|
static int initAll();
|
|
};
|
|
|
|
struct EmbeddedSwig
|
|
{
|
|
void (*initFunc)();
|
|
|
|
std::string context;
|
|
|
|
EmbeddedSwig(void (*init_func)(), const std::string& _context);
|
|
|
|
static std::list<EmbeddedSwig *> &getList();
|
|
static void initAll();
|
|
};
|
|
|
|
int initM5Python();
|
|
int m5Main(int argc, char **argv);
|
|
PyMODINIT_FUNC initm5(void);
|
|
|
|
#endif // __SIM_INIT_HH__
|