caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove emb.cc

Browse Source
This commit is contained in:
Miodrag Milanovic 2018-06-28 16:22:46 +02:00
parent 45032e2224
commit 2037fff742
5 changed files with 1 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
common/emb.cc
View File

@ -1,140 +0,0 @@
//
// Copyright (C) 2011 Mateusz Loskot <mateusz@loskot.net>
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
// Blog article: http://mateusz.loskot.net/?p=2819
#ifndef NO_PYTHON
#include "emb.h"
#include <Python.h>
#include <functional>
#include <iostream>
#include <string>
namespace emb {
struct Stdout
{
PyObject_HEAD stdout_write_type write;
};
PyObject *Stdout_write(PyObject *self, PyObject *args)
{
std::size_t written(0);
Stdout *selfimpl = reinterpret_cast<Stdout *>(self);
if (selfimpl->write) {
char *data;
if (!PyArg_ParseTuple(args, "s", &data))
return 0;
std::string str(data);
selfimpl->write(str);
written = str.size();
}
return PyLong_FromSize_t(written);
}
PyObject *Stdout_flush(PyObject *self, PyObject *args)
{
// no-op
return Py_BuildValue("");
}
PyMethodDef Stdout_methods[] = {
{"write", Stdout_write, METH_VARARGS, "sys.stdout.write"},
{"flush", Stdout_flush, METH_VARARGS, "sys.stdout.write"},
{0, 0, 0, 0} // sentinel
};
PyTypeObject StdoutType = {
PyVarObject_HEAD_INIT(0, 0) "emb.StdoutType", /* tp_name */
sizeof(Stdout), /* tp_basicsize */
0, /* tp_itemsize */
0, /* tp_dealloc */
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_reserved */
0, /* tp_repr */
0, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
0, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT, /* tp_flags */
"emb.Stdout objects", /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
Stdout_methods, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
0, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
};
PyModuleDef embmodule = {
PyModuleDef_HEAD_INIT, "emb", 0, -1, 0,
};
// Internal state
PyObject *g_stdout;
PyObject *g_stdout_saved;
PyMODINIT_FUNC PyInit_emb(void)
{
g_stdout = 0;
g_stdout_saved = 0;
StdoutType.tp_new = PyType_GenericNew;
if (PyType_Ready(&StdoutType) < 0)
return 0;
PyObject *m = PyModule_Create(&embmodule);
if (m) {
Py_INCREF(&StdoutType);
PyModule_AddObject(m, "Stdout", reinterpret_cast<PyObject *>(&StdoutType));
}
return m;
}
void set_stdout(stdout_write_type write)
{
if (!g_stdout) {
g_stdout_saved = PySys_GetObject("stdout"); // borrowed
g_stdout = StdoutType.tp_new(&StdoutType, 0, 0);
}
Stdout *impl = reinterpret_cast<Stdout *>(g_stdout);
impl->write = write;
PySys_SetObject("stdout", g_stdout);
}
void reset_stdout()
{
if (g_stdout_saved)
PySys_SetObject("stdout", g_stdout_saved);
Py_XDECREF(g_stdout);
g_stdout = 0;
}
void append_inittab() { PyImport_AppendInittab("emb", emb::PyInit_emb); }
} // namespace emb
#endif // NO_PYTHON

20
common/emb.h
View File

@ -1,20 +0,0 @@
//
// Copyright (C) 2011 Mateusz Loskot <mateusz@loskot.net>
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
// Blog article: http://mateusz.loskot.net/?p=2819
#include <functional>
#include <iostream>
#include <string>
namespace emb {
typedef std::function<void(std::string)> stdout_write_type;
void set_stdout(stdout_write_type write);
void reset_stdout();
void append_inittab();
} // namespace emb

5
common/pybindings.cc
View File

@ -21,7 +21,6 @@
#ifndef NO_PYTHON #ifndef NO_PYTHON
#include "pybindings.h" #include "pybindings.h"
#include "emb.h"
#include "jsonparse.h" #include "jsonparse.h"
#include "nextpnr.h" #include "nextpnr.h"
@ -138,10 +137,8 @@ void init_python(const char *executable, bool first)
exit(1); exit(1);
} }
try { try {
if (first) { if (first)
PyImport_AppendInittab(TOSTRING(MODULE_NAME), PYINIT_MODULE_NAME); PyImport_AppendInittab(TOSTRING(MODULE_NAME), PYINIT_MODULE_NAME);
emb::append_inittab();
}
Py_SetProgramName(program); Py_SetProgramName(program);
Py_Initialize(); Py_Initialize();
if (first) if (first)

9
gui/pythontab.cc
View File

@ -20,7 +20,6 @@
#include "pythontab.h" #include "pythontab.h"
#include <QGridLayout> #include <QGridLayout>
#include "emb.h"
#include "pybindings.h" #include "pybindings.h"
NEXTPNR_NAMESPACE_BEGIN NEXTPNR_NAMESPACE_BEGIN
@ -73,14 +72,6 @@ void PythonTab::newContext(Context *ctx)
init_python("nextpnr", !initialized); init_python("nextpnr", !initialized);
python_export_global("ctx", ctx); python_export_global("ctx", ctx);
PyImport_ImportModule("emb");
write = [this](std::string s) {
plainTextEdit->moveCursor(QTextCursor::End);
plainTextEdit->insertPlainText(s.c_str());
plainTextEdit->moveCursor(QTextCursor::End);
};
emb::set_stdout(write);
initialized = true; initialized = true;
char buff[1024]; char buff[1024];

2
gui/pythontab.h
View File

@ -25,7 +25,6 @@
#include <QLineEdit> #include <QLineEdit>
#include <QMenu> #include <QMenu>
#include <QPlainTextEdit> #include <QPlainTextEdit>
#include "emb.h"
#include "line_editor.h" #include "line_editor.h"
#include "nextpnr.h" #include "nextpnr.h"
@ -52,7 +51,6 @@ class PythonTab : public QWidget
QPlainTextEdit *plainTextEdit; QPlainTextEdit *plainTextEdit;
LineEditor *lineEdit; LineEditor *lineEdit;
QMenu *contextMenu; QMenu *contextMenu;
emb::stdout_write_type write;
bool initialized; bool initialized;
}; };