Re: CVS commit: src/sys

[David Young <dyoung%pobox.com@localhost>]

On Thu, Apr 29, 2010 at 08:52:16AM +0000, Andrew Doran wrote:
> Also annoying that so much of this code is MD.
> 
> Please run large x86 changes by me before commit.  I would have told you
> what Matt just did :-).  FYI you can now remove the #error from both busfunc.S
> and special _ALIGN_TEXT definitions since the sizes of the routines will be
> quite different now.

Something like this?

Dave

-- 
David Young             OJC Technologies
dyoung%ojctech.com@localhost      Urbana, IL * (217) 278-3933

Index: sys/arch/i386/i386/busfunc.S
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/i386/busfunc.S,v
retrieving revision 1.6
diff -u -p -r1.6 busfunc.S
--- sys/arch/i386/i386/busfunc.S        28 Apr 2010 19:17:03 -0000      1.6
+++ sys/arch/i386/i386/busfunc.S        29 Apr 2010 17:30:57 -0000
@@ -34,10 +34,6 @@ __KERNEL_RCSID(0, "$NetBSD: busfunc.S,v 
 
 #include "assym.h"
 
-/* XXX */
-#undef _ALIGN_TEXT
-#define        _ALIGN_TEXT     .align 16
-
 /*
  * uint8_t bus_space_read_1(bus_space_tag_t tag, bus_space_handle_t bsh,
  *    bus_size_t offset);
Index: sys/arch/amd64/amd64/busfunc.S
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/amd64/busfunc.S,v
retrieving revision 1.8
diff -u -p -r1.8 busfunc.S
--- sys/arch/amd64/amd64/busfunc.S      28 Apr 2010 19:17:03 -0000      1.8
+++ sys/arch/amd64/amd64/busfunc.S      29 Apr 2010 17:30:57 -0000
@@ -33,14 +33,6 @@
 
 #include "assym.h"
 
-/* XXX */
-#undef _ALIGN_TEXT
-#define        _ALIGN_TEXT     .align 16
-
-#if X86_BUS_SPACE_IO != 0
-#error depends on X86_BUS_SPACE_IO == 0
-#endif
-
 .Ldopanic:
        movq    $.Lpstr, %rdi
        call    _C_LABEL(panic)