@@ -253,9 +253,9 @@ static const gdb_register_map gdb_register_map_m68020pmmu =
253
253
{ " A4" , " a4" , false , TYPE_INT },
254
254
{ " A5" , " a5" , false , TYPE_INT },
255
255
{ " A6" , " fp" , true , TYPE_INT },
256
- { " A7 " , " sp" , true , TYPE_INT },
256
+ { " SP " , " sp" , true , TYPE_INT },
257
257
{ " SR" , " ps" , false , TYPE_INT }, // NOTE GDB named it ps, but it's actually sr
258
- { " PC " , " pc" , true , TYPE_CODE_POINTER },
258
+ { " CURPC " , " pc" , true , TYPE_CODE_POINTER },
259
259
}
260
260
};
261
261
@@ -280,9 +280,9 @@ static const gdb_register_map gdb_register_map_m68000 =
280
280
{ " A4" , " a4" , false , TYPE_INT },
281
281
{ " A5" , " a5" , false , TYPE_INT },
282
282
{ " A6" , " fp" , true , TYPE_INT },
283
- { " A7 " , " sp" , true , TYPE_INT },
283
+ { " SP " , " sp" , true , TYPE_INT },
284
284
{ " SR" , " ps" , false , TYPE_INT }, // NOTE GDB named it ps, but it's actually sr
285
- { " PC " , " pc" , true , TYPE_CODE_POINTER },
285
+ { " CURPC " , " pc" , true , TYPE_CODE_POINTER },
286
286
// NOTE m68-elf-gdb complains about fpcontrol register not present but 68000 doesn't have floating point so...
287
287
}
288
288
};
@@ -682,6 +682,9 @@ static std::string escape_packet(const std::string src)
682
682
result.reserve (src.length ());
683
683
for ( char ch: src )
684
684
{
685
+ if ( ch == ' \n ' ) // don't let socket convert line endings and messing up the checksum
686
+ continue ;
687
+
685
688
if ( ch == ' #' || ch == ' $' || ch == ' }' )
686
689
{
687
690
result += ' }' ;
0 commit comments