Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/m68k/m68k Fix an asm-comments-vs-preprocessor-line-...



details:   https://anonhg.NetBSD.org/src/rev/5f93b9c82d53
branches:  trunk
changeset: 998258:5f93b9c82d53
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Apr 12 03:29:24 2019 +0000

description:
Fix an asm-comments-vs-preprocessor-line-continuations mistake in
UFETCH_PROLOGUE and USTORE_PROLOGUE that caused a couple of important
instructions to be omitted, resulting in a fatal trap.

Thanks isaki@ for finding my mistake and providing the fix!

diffstat:

 sys/arch/m68k/m68k/copy.s |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r 52a1287305d6 -r 5f93b9c82d53 sys/arch/m68k/m68k/copy.s
--- a/sys/arch/m68k/m68k/copy.s Fri Apr 12 01:14:37 2019 +0000
+++ b/sys/arch/m68k/m68k/copy.s Fri Apr 12 03:29:24 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: copy.s,v 1.47 2019/04/06 03:06:26 thorpej Exp $        */
+/*     $NetBSD: copy.s,v 1.48 2019/04/12 03:29:24 thorpej Exp $        */
 
 /*-
  * Copyright (c) 1998, 2019 The NetBSD Foundation, Inc.
@@ -364,8 +364,8 @@
 
 #define        UFETCH_PROLOGUE                                                 \
        CHECK_SFC                                               ;       \
-       movl    4(%sp),%a0              | address to read       ;       \
-       GETCURPCB(%a1)                  | a1 = curpcb           ;       \
+       movl    4(%sp),%a0              /* address to read */   ;       \
+       GETCURPCB(%a1)                  /* a1 = curpcb */       ;       \
        movl    #.Lufetchstore_fault,PCB_ONFAULT(%a1)
 
 /* LINTSTUB: _ufetch_8(const uint8_t *uaddr, uint8_t *valp); */
@@ -394,8 +394,8 @@
 
 #define        USTORE_PROLOGUE                                                 \
        CHECK_DFC                                               ;       \
-       movl    4(%sp),%a0              | address to write      ;       \
-       GETCURPCB(%a1)                  | a1 = curpcb           ;       \
+       movl    4(%sp),%a0              /* address to write */  ;       \
+       GETCURPCB(%a1)                  /* a1 = curpcb */       ;       \
        movl    #.Lufetchstore_fault,PCB_ONFAULT(%a1)
 
 /* LINTSTUB: _ustore_8(uint8_t *uaddr, uint8_t val); */



Home | Main Index | Thread Index | Old Index