From acdd81c29ac9359bd2eb97d60644ed3d6a568225 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Tue, 2 Jan 2007 17:03:41 +0000 Subject: [PATCH] 2007-01-02 Kazu Hirata Merge from newlib-csl-20060320-branch: 2006-12-22 Nathan Sidwell * m68k/cf-hosted.S (__hosted): Adjust semihosting. --- libgloss/ChangeLog | 7 +++++++ libgloss/m68k/cf-hosted.S | 14 ++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog index 4353a50b1..7f02bb7ff 100644 --- a/libgloss/ChangeLog +++ b/libgloss/ChangeLog @@ -1,3 +1,10 @@ +2007-01-02 Kazu Hirata + + Merge from newlib-csl-20060320-branch: + 2006-12-22 Nathan Sidwell + + * m68k/cf-hosted.S (__hosted): Adjust semihosting. + 2007-01-02 Ben Elliston * spu/time.c (time): Cast new sys.time value to unsigned int. diff --git a/libgloss/m68k/cf-hosted.S b/libgloss/m68k/cf-hosted.S index 9cf88209c..ed8e8917f 100644 --- a/libgloss/m68k/cf-hosted.S +++ b/libgloss/m68k/cf-hosted.S @@ -22,17 +22,15 @@ __hosted: linkw %fp,#0 movel %fp@(8),%d0 movel %fp@(12),%d1 - .align 4 - /* The halt sequence must be 'nop; halt' and aligned to a 4 byte - boundary. */ + /* The semihosting sequence is 'nop; halt;sentinel' aligned to + a 4 byte boundary. The sentinel is an ill formed instruction + (movec %sp,0). The debugger will adjust the pc, so it is never + executed. */ + .balignw 4,0x4e71 nop halt - - /* This sentinel instruction value must be immediately after - the halt instruction. The debugger will adjust the pc, so - that it is never executed. This instruction is - 'movec %sp,0'. */ .long 0x4e7bf000 + unlk %fp rts