5 files changed, 50 insertions, 27 deletions
diff --git a/host/lib/device.cpp b/host/lib/device.cpp
index 386588a08..34dd3f854 100644
--- a/host/lib/device.cpp
+++ b/host/lib/device.cpp
@@ -140,7 +140,7 @@ device::sptr device::make(const device_addr_t &hint, size_t which){
         return hash_to_device[dev_hash].lock();
     }
     //create and register a new device
-    catch(const uhd::assert_error &){
+    catch(const uhd::assertion_error &){
         device::sptr dev = maker(dev_addr);
         hash_to_device[dev_hash] = dev;
         return dev;
diff --git a/host/lib/usrp/dboard_eeprom.cpp b/host/lib/usrp/dboard_eeprom.cpp
index c47390bf8..5e8e27272 100644
--- a/host/lib/usrp/dboard_eeprom.cpp
+++ b/host/lib/usrp/dboard_eeprom.cpp
@@ -128,7 +128,7 @@ void dboard_eeprom_t::load(i2c_iface &iface, boost::uint8_t addr){
             &bytes.at(DB_EEPROM_SERIAL+DB_EEPROM_SERIAL_LEN))
         );
 
-    }catch(const uhd::assert_error &){
+    }catch(const uhd::assertion_error &){
         id = dboard_id_t::none();
         serial = "";
     }
diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt
index a4d3b2db2..082553ff9 100644
--- a/host/lib/utils/CMakeLists.txt
+++ b/host/lib/utils/CMakeLists.txt
@@ -110,7 +110,7 @@ SET_SOURCE_FILES_PROPERTIES(
 # Append sources
 ########################################################################
 LIBUHD_APPEND_SOURCES(
-    ${CMAKE_CURRENT_SOURCE_DIR}/assert.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/exception.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/gain_group.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/images.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/load_modules.cpp
diff --git a/host/lib/utils/assert.cpp b/host/lib/utils/assert.cpp
deleted file mode 100644
index 7ace9024c..000000000
--- a/host/lib/utils/assert.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#include <uhd/utils/assert.hpp>
-
-using namespace uhd;
-
-assert_error::assert_error(const std::string &what) : std::runtime_error(what){
-    /* NOP */
-}
diff --git a/host/lib/utils/exception.cpp b/host/lib/utils/exception.cpp
new file mode 100644
index 000000000..e66addb0c
--- /dev/null
+++ b/host/lib/utils/exception.cpp
@@ -0,0 +1,47 @@
+//
+// Copyright 2011 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include <uhd/utils/assert.hpp>
+#include <boost/functional/hash.hpp>
+#include <boost/format.hpp>
+
+using namespace uhd;
+
+static unsigned make_code(const std::string &name){
+    boost::hash<std::string> string_hash;
+    return unsigned(string_hash(name) & 0xfff);
+};
+
+exception::exception(const std::string &what):
+    std::runtime_error(what){/* NOP */}
+
+#define make_exception_impl(name, class, base) \
+    class::class(const std::string &what): \
+        base(str(boost::format("%s: %s") % name % what)){} \
+    unsigned class::code(void) const{return make_code(#class);}
+
+make_exception_impl("AssertionError",        assertion_error,         exception)
+make_exception_impl("LookupError",           lookup_error,            exception)
+make_exception_impl("IndexError",            index_error,             lookup_error)
+make_exception_impl("KeyError",              key_error,               lookup_error)
+make_exception_impl("ValueError",            value_error,             exception)
+make_exception_impl("RuntimeError",          runtime_error,           exception)
+make_exception_impl("NotImplementedError",   not_implemented_error,   runtime_error)
+make_exception_impl("EnvironmentError",      environment_error,       exception)
+make_exception_impl("IOError",               io_error,                environment_error)
+make_exception_impl("OSError",               os_error,                environment_error)
+make_exception_impl("SystemError",           system_error,            exception)