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

python: Convert empty BelId to None

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-07-04 15:26:09 +02:00
parent 11fb625195
commit 726f2020f1
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
generic/arch_pybindings.cc
View File

@ -20,8 +20,8 @@
#ifndef NO_PYTHON
#include "pybindings.h"
#include "nextpnr.h"
#include "pybindings.h"
NEXTPNR_NAMESPACE_BEGIN

2
generic/arch_pybindings.h
View File

@ -21,8 +21,8 @@
#define ARCH_PYBINDINGS_H
#ifndef NO_PYTHON
#include "pybindings.h"
#include "nextpnr.h"
#include "pybindings.h"
NEXTPNR_NAMESPACE_BEGIN

2
ice40/arch_pybindings.cc
View File

@ -20,9 +20,9 @@
#ifndef NO_PYTHON
#include "pybindings.h"
#include "arch_pybindings.h"
#include "nextpnr.h"
#include "pybindings.h"
NEXTPNR_NAMESPACE_BEGIN

10
ice40/arch_pybindings.h
View File

@ -21,8 +21,9 @@
#define ARCH_PYBINDINGS_H
#ifndef NO_PYTHON
#include "pybindings.h"
#include "nextpnr.h"
#include "pybindings.h"
#include "pywrappers.h"
NEXTPNR_NAMESPACE_BEGIN
@ -32,7 +33,12 @@ template <> struct string_converter<BelId>
{
BelId from_str(Context *ctx, std::string name) { return ctx->getBelByName(ctx->id(name)); }
std::string to_str(Context *ctx, BelId id) { return ctx->getBelName(id).str(ctx); }
std::string to_str(Context *ctx, BelId id)
{
if (id == BelId())
throw bad_wrap();
return ctx->getBelName(id).str(ctx);
}
};
template <> struct string_converter<BelType>

2
python/dump_design.py
View File

@ -20,6 +20,6 @@ for cell, cinfo in sorted(ctx.cells, key=lambda x: x.first):
val = "{}'b{}".format(len(val), val)
print("\t\t{}: {}".format(param, val))
if cinfo.bel.index != -1:
if cinfo.bel is not None:
print("\tBel: {}".format(cinfo.bel))
print()