X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fdoc%2Fc-m68k.texi;h=ad07a6a9bf71fbfb4ae535b175905ed1d0b60936;hb=b90efa5b79ac1524ec260f8eb89d1be37e0219a7;hp=d4da2a1ea452ea74c797cabf09ee8c1120ff4892;hpb=01f0fe5e0450edf168c1f612feb93cf588e4e7ea;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/doc/c-m68k.texi b/gas/doc/c-m68k.texi
index d4da2a1ea4..ad07a6a9bf 100644
--- a/gas/doc/c-m68k.texi
+++ b/gas/doc/c-m68k.texi
@@ -1,5 +1,4 @@
-@c Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000, 2003,
-@c 2004 Free Software Foundation, Inc.
+@c Copyright (C) 1991-2015 Free Software Foundation, Inc.
 @c This is part of the GAS manual.
 @c For copying conditions, see the file as.texinfo.
 @ifset GENERIC
@@ -45,7 +44,8 @@ architectures are recognized:
 @code{cpu32},
 @code{isaa},
 @code{isaaplus},
-@code{isab} and
+@code{isab},
+@code{isac} and
 @code{cfv4e}.
 
 
@@ -64,12 +64,12 @@ for instruction generation, rather than those of the specific chip.
 @cindex @samp{-m[no-]mac} command line option, M680x0
 @cindex @samp{-m[no-]emac} command line option, M680x0
 @item -m[no-]68851
-@item -m[no-]68881
-@item -m[no-]div
-@item -m[no-]usp
-@item -m[no-]float
-@item -m[no-]mac
-@item -m[no-]emac
+@itemx -m[no-]68881
+@itemx -m[no-]div
+@itemx -m[no-]usp
+@itemx -m[no-]float
+@itemx -m[no-]mac
+@itemx -m[no-]emac
 
 Enable or disable various architecture specific features.  If a chip
 or architecture by default supports an option (for instance
@@ -112,7 +112,7 @@ at the beginning of a line.
 
 @cindex @samp{--base-size-default-16}
 @cindex @samp{--base-size-default-32}
-@item --base-size-default-16  --base-size-default-32 
+@item --base-size-default-16  --base-size-default-32
 If you use an addressing mode with a base register without specifying
 the size, @code{@value{AS}} will normally use the full 32 bit value.
 For example, the addressing mode @samp{%a0@@(%d0)} is equivalent to
@@ -209,19 +209,19 @@ Assemble for the 68060.
 Assemble for the CPU32 family of chips.
 
 @item -m5200
-@item -m5202
-@item -m5204
-@item -m5206
-@item -m5206e
-@item -m521x
-@item -m5249
-@item -m528x
-@item -m5307
-@item -m5407
-@item -m547x
-@item -m548x
-@item -mcfv4
-@item -mcfv4e
+@itemx -m5202
+@itemx -m5204
+@itemx -m5206
+@itemx -m5206e
+@itemx -m521x
+@itemx -m5249
+@itemx -m528x
+@itemx -m5307
+@itemx -m5407
+@itemx -m547x
+@itemx -m548x
+@itemx -mcfv4
+@itemx -mcfv4e
 Assemble for the ColdFire family of chips.
 
 @item -m68881
@@ -284,7 +284,7 @@ The following addressing modes are understood:
 
 @item Address Register
 @samp{%a0} through @samp{%a7}@*
-@samp{%a7} is also known as @samp{%sp}, i.e. the Stack Pointer.  @code{%a6}
+@samp{%a7} is also known as @samp{%sp}, i.e., the Stack Pointer.  @code{%a6}
 is also known as @samp{%fp}, the Frame Pointer.
 
 @item Address Register Indirect
@@ -345,8 +345,8 @@ The following additional addressing modes are understood:
 
 @table @dfn
 @item Address Register Indirect
-@samp{(%a0)} through @samp{(%a7)}@* 
-@samp{%a7} is also known as @samp{%sp}, i.e. the Stack Pointer.  @code{%a6}
+@samp{(%a0)} through @samp{(%a7)}@*
+@samp{%a7} is also known as @samp{%sp}, i.e., the Stack Pointer.  @code{%a6}
 is also known as @samp{%fp}, the Frame Pointer.
 
 @item Address Register Postincrement
@@ -445,11 +445,11 @@ This directive is identical to a @code{.space} directive.
 
 @cindex @code{arch} directive, M680x0
 @item .arch @var{name}
-Select the target architecture and extension features.  Valid valuse
+Select the target architecture and extension features.  Valid values
 for @var{name} are the same as for the @option{-march} command line
 option.  This directive cannot be specified after
 any instructions have been assembled.  If it is given multiple times,
-or in conjuction with the @option{-march} option, all uses must be for
+or in conjunction with the @option{-march} option, all uses must be for
 the same architecture and extension set.
 
 @cindex @code{cpu} directive, M680x0
@@ -458,7 +458,7 @@ Select the target cpu.  Valid valuse
 for @var{name} are the same as for the @option{-mcpu} command line
 option.  This directive cannot be specified after
 any instructions have been assembled.  If it is given multiple times,
-or in conjuction with the @option{-mopt} option, all uses must be for
+or in conjunction with the @option{-mopt} option, all uses must be for
 the same cpu.
 
 @end table
@@ -608,14 +608,29 @@ branch instructions allow both word and long displacements.
 @subsection Special Characters
 
 @cindex special characters, M680x0
-@cindex M680x0 immediate character
-@cindex immediate character, M680x0
+
 @cindex M680x0 line comment character
 @cindex line comment character, M680x0
 @cindex comments, M680x0
-The immediate character is @samp{#} for Sun compatibility.  The
-line-comment character is @samp{|} (unless the @samp{--bitwise-or}
-option is used).  If a @samp{#} appears at the beginning of a line, it
-is treated as a comment unless it looks like @samp{# line file}, in
-which case it is treated normally.
+Line comments are introduced by the @samp{|} character appearing
+anywhere on a line, unless the @option{--bitwise-or} command line option
+has been specified.
+
+An asterisk (@samp{*}) as the first character on a line marks the
+start of a line comment as well.
+
+@cindex M680x0 immediate character
+@cindex immediate character, M680x0
+
+A hash character (@samp{#}) as the first character on a line also
+marks the start of a line comment, but in this case it could also be a
+logical line number directive (@pxref{Comments}) or a preprocessor
+control command (@pxref{Preprocessing}).  If the hash character
+appears elsewhere on a line it is used to introduce an immediate
+value.  (This is for compatibility with Sun's assembler).
+
+@cindex M680x0 line separator
+@cindex line separator, M680x0
 
+Multiple statements on the same line can appear if they are separated
+by the @samp{;} character.