X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fcommon%2Fsim-assert.h;h=8a682765ac2d8a8b2c15108e096486ba3d978ca3;hb=8b8c7c9f49992750f66f81b4601d593a3858d98c;hp=937d13216b44d622a70d352f36097b4d3bb0a722;hpb=4744ac1bb0d2f2294c7762577262fdcafb67883b;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/common/sim-assert.h b/sim/common/sim-assert.h
index 937d13216b..8a682765ac 100644
--- a/sim/common/sim-assert.h
+++ b/sim/common/sim-assert.h
@@ -1,6 +1,6 @@
 /*  This file is part of the program GDB.
 
-    Copyright (C) 1997, Free Software Foundation, Inc.
+    Copyright (C) 1997-2016 Free Software Foundation, Inc.
 
     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
@@ -14,27 +14,12 @@
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
-    */
 
+    */
 
-#ifndef _SIM_ASSERT_H_
-#define _SIM_ASSERT_H_
 
-#define SIM_FILTER_PATH(FILE, PATH) \
-do \
-  { \
-    /* strip leading path */ \
-    const char *p = (PATH); \
-    (FILE) = p; \
-    while (*p != '\0' && *p != ':') \
-      { \
-        if (*p == '/') \
-          (FILE) = p + 1; \
-        p++; \
-      } \
-  } \
-while (0)
+#ifndef SIM_ASSERT_H
+#define SIM_ASSERT_H
 
 /* The subtle difference between SIM_ASSERT and ASSERT is that
    SIM_ASSERT passes `sd' to sim_io_error for the SIM_DESC,
@@ -42,6 +27,8 @@ while (0)
 
 #if !defined (SIM_ASSERT)
 #if defined (WITH_ASSERT)
+#include "sim-io.h"
+#include "libiberty.h"
 #define SIM_ASSERT(EXPRESSION) \
 do \
   { \
@@ -50,10 +37,8 @@ do \
         if (!(EXPRESSION)) \
           { \
             /* report the failure */ \
-            const char *file; \
-            SIM_FILTER_PATH(file, __FILE__); \
             sim_io_error (sd, "%s:%d: assertion failed - %s", \
-                          file, __LINE__, #EXPRESSION); \
+                          lbasename (__FILE__), __LINE__, #EXPRESSION); \
           } \
       } \
   } \
@@ -65,6 +50,8 @@ while (0)
 
 #if !defined (ASSERT)
 #if defined (WITH_ASSERT)
+#include "sim-io.h"
+#include "libiberty.h"
 #define ASSERT(EXPRESSION) \
 do \
   { \
@@ -73,10 +60,8 @@ do \
         if (!(EXPRESSION)) \
           { \
             /* report the failure */ \
-            const char *file; \
-            SIM_FILTER_PATH(file, __FILE__); \
             sim_io_error (NULL, "%s:%d: assertion failed - %s", \
-                          file, __LINE__, #EXPRESSION); \
+                          lbasename (__FILE__), __LINE__, #EXPRESSION); \
           } \
       } \
   } \