summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/lib/netlist/nl_errstr.h2
-rw-r--r--src/lib/netlist/nl_setup.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/netlist/nl_errstr.h b/src/lib/netlist/nl_errstr.h
index c0097cadb15..dc5008404f4 100644
--- a/src/lib/netlist/nl_errstr.h
+++ b/src/lib/netlist/nl_errstr.h
@@ -58,7 +58,7 @@ namespace netlist
PERRMSGV(MF_DEVICE_ALREADY_EXISTS_1, 1, "Device already exists: {1}")
PERRMSGV(MF_UNUSED_HINT_1, 1, "Error hint {1} is not used")
PERRMSGV(MF_ADDING_HINT_1, 1, "Error adding hint {1} to hint list")
- PERRMSGV(MF_ADDING_ALI1_TO_ALIAS_LIST, 1, "Error adding alias {1} to alias list")
+ PERRMSGV(MF_ALIAS_ALREAD_EXISTS_1, 1, "Alias already exists: {1}")
PERRMSGV(MF_DIP_PINS_MUST_BE_AN_EQUAL_NUMBER_OF_PINS_1, 1,"You must pass an equal number of pins to DIPPINS {1}")
PERRMSGV(MF_PARAM_COUNT_MISMATCH_2, 2, "Parameter count mismatch for {1} - only found {2}")
PERRMSGV(MF_PARAM_COUNT_EXCEEDED_2, 2, "Parameter count exceed for {1} - found {2}")
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index 3abc9b1bc75..162880ba9e3 100644
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -87,8 +87,8 @@ namespace netlist
pstring key = build_fqn(name);
if (device_exists(key))
{
- log().fatal(MF_DEVICE_ALREADY_EXISTS_1(name));
- throw nl_exception(MF_DEVICE_ALREADY_EXISTS_1(name));
+ log().fatal(MF_DEVICE_ALREADY_EXISTS_1(key));
+ throw nl_exception(MF_DEVICE_ALREADY_EXISTS_1(key));
}
m_abstract.m_device_factory.insert(m_abstract.m_device_factory.end(), {key, f});
@@ -332,8 +332,8 @@ namespace netlist
{
if (!m_abstract.m_alias.insert({alias, out}).second)
{
- log().fatal(MF_ADDING_ALI1_TO_ALIAS_LIST(alias));
- throw nl_exception(MF_ADDING_ALI1_TO_ALIAS_LIST(alias));
+ log().fatal(MF_ALIAS_ALREAD_EXISTS_1(alias));
+ throw nl_exception(MF_ALIAS_ALREAD_EXISTS_1(alias));
}
}