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

Add NPNR_ASSERT_FALSE, use in bitstream.cc

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-07-04 13:04:31 +02:00
parent 6eaae6196c
commit 2e8c0c872f
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/nextpnr.h
View File

@ -44,7 +44,7 @@
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
#define NPNR_ATTRIBUTE(...) __attribute__((__VA_ARGS__)) #define NPNR_ATTRIBUTE(...) __attribute__((__VA_ARGS__))
#define NPNR_NORETURN #define NPNR_NORETURN __attribute__((noreturn))
#define NPNR_DEPRECATED __attribute__((deprecated)) #define NPNR_DEPRECATED __attribute__((deprecated))
#define NPNR_PACKED_STRUCT(...) __VA_ARGS__ __attribute__((packed)) #define NPNR_PACKED_STRUCT(...) __VA_ARGS__ __attribute__((packed))
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
@ -78,8 +78,15 @@ inline void except_assert_impl(bool expr, std::string message, std::string expr_
throw assertion_failure(message, expr_str, filename, line); throw assertion_failure(message, expr_str, filename, line);
} }
NPNR_NORETURN
inline void assert_false_impl(std::string message, std::string filename, int line)
{
throw assertion_failure(message, "false", filename, line);
}
#define NPNR_ASSERT(cond) except_assert_impl((cond), #cond, #cond, __FILE__, __LINE__) #define NPNR_ASSERT(cond) except_assert_impl((cond), #cond, #cond, __FILE__, __LINE__)
#define NPNR_ASSERT_MSG(cond, msg) except_assert_impl((cond), msg, #cond, __FILE__, __LINE__) #define NPNR_ASSERT_MSG(cond, msg) except_assert_impl((cond), msg, #cond, __FILE__, __LINE__)
#define NPNR_ASSERT_FALSE(msg) assert_false_impl(msg, __FILE__, __LINE__)
struct BaseCtx; struct BaseCtx;
struct Context; struct Context;

4
ice40/bitstream.cc
View File

@ -36,7 +36,7 @@ const ConfigEntryPOD &find_config(const TileInfoPOD &tile, const std::string &na
return tile.entries[i]; return tile.entries[i];
} }
} }
NPNR_ASSERT(false); NPNR_ASSERT_FALSE("unable to find config bit " + name);
} }
std::tuple<int8_t, int8_t, int8_t> get_ieren(const BitstreamInfoPOD &bi, int8_t x, int8_t y, int8_t z) std::tuple<int8_t, int8_t, int8_t> get_ieren(const BitstreamInfoPOD &bi, int8_t x, int8_t y, int8_t z)
@ -124,7 +124,7 @@ void write_asc(const Context *ctx, std::ostream &out)
out << ".device 5k" << std::endl; out << ".device 5k" << std::endl;
break; break;
default: default:
NPNR_ASSERT(false); NPNR_ASSERT_FALSE("unsupported device type");
} }
// Set pips // Set pips
for (auto pip : ctx->getPips()) { for (auto pip : ctx->getPips()) {