diff --git a/src/osd/modules/debugger/debuggdbstub.cpp b/src/osd/modules/debugger/debuggdbstub.cpp
index 1402988111c..3b7b828d176 100644
--- a/src/osd/modules/debugger/debuggdbstub.cpp
+++ b/src/osd/modules/debugger/debuggdbstub.cpp
@@ -1300,22 +1300,6 @@ void debug_gdbstub::handle_packet()
 		send_reply("");
 }
 
-//-------------------------------------------------------------------------
-#define BYTESWAP_64(x) ((((x) << 56) & 0xFF00000000000000) \
-					  | (((x) << 40) & 0x00FF000000000000) \
-					  | (((x) << 24) & 0x0000FF0000000000) \
-					  | (((x) <<  8) & 0x000000FF00000000) \
-					  | (((x) >>  8) & 0x00000000FF000000) \
-					  | (((x) >> 24) & 0x0000000000FF0000) \
-					  | (((x) >> 40) & 0x000000000000FF00) \
-					  | (((x) >> 56) & 0x00000000000000FF))
-#define BYTESWAP_32(x) ((((x) << 24) & 0xFF000000) \
-					  | (((x) <<  8) & 0x00FF0000) \
-					  | (((x) >>  8) & 0x0000FF00) \
-					  | (((x) >> 24) & 0x000000FF))
-#define BYTESWAP_16(x) ((((x) <<  8) & 0xFF00) \
-					  | (((x) >>  8) & 0x00FF))
-
 //-------------------------------------------------------------------------
 std::string debug_gdbstub::get_register_string(int gdb_regnum)
 {
@@ -1329,9 +1313,9 @@ std::string debug_gdbstub::get_register_string(int gdb_regnum)
 		value &= (1ULL << reg.gdb_bitsize) - 1;
 	if ( !m_is_be )
 	{
-		value = (reg.gdb_bitsize == 64) ? BYTESWAP_64(value)
-			  : (reg.gdb_bitsize == 32) ? BYTESWAP_32(value)
-			  : (reg.gdb_bitsize == 16) ? BYTESWAP_16(value)
+		value = (reg.gdb_bitsize == 64) ? swapendian_int64(value)
+			  : (reg.gdb_bitsize == 32) ? swapendian_int32(value)
+			  : (reg.gdb_bitsize == 16) ? swapendian_int16(value)
 			  :                           value;
 	}
 	return string_format(fmt, value);
@@ -1350,9 +1334,9 @@ bool debug_gdbstub::parse_register_string(uint64_t *pvalue, const char *buf, int
 		return false;
 	if ( !m_is_be )
 	{
-		value = (reg.gdb_bitsize == 64) ? BYTESWAP_64(value)
-			  : (reg.gdb_bitsize == 32) ? BYTESWAP_32(value)
-			  : (reg.gdb_bitsize == 16) ? BYTESWAP_16(value)
+		value = (reg.gdb_bitsize == 64) ? swapendian_int64(value)
+			  : (reg.gdb_bitsize == 32) ? swapendian_int32(value)
+			  : (reg.gdb_bitsize == 16) ? swapendian_int16(value)
 			  :                           value;
 	}
 	*pvalue = value;