This is the mail archive of the newlib@sources.redhat.com mailing list for the newlib project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: AM33/2.0 support


On Jul 10, 2003, "J. Johnston" <jjohnstn@redhat.com> wrote:

> 1. Change the code in setjmp.h to be:

>      #ifdef __AM33_2__
>      #define _JBLEN 26
>      #else
>      #define _JBLEN 10
>      #endif

Done.

> 2. If there is any possibility that both the __AM33__ and __AM33_2__ flags
>     can be on at the same time, change the assembler code to use #else unless
>     both assembler directives are required.

Oops, I had missed this before I went ahead and checked the following
patch in.  I'll go back and check whether .am33_2 by itself will do,
if that's what you mean.  I'm pretty sure it will.

Index: newlib/ChangeLog
from  Alexandre Oliva  <aoliva@redhat.com>

	2000-04-27  Alexandre Oliva  <aoliva@cygnus.com>
	* libc/include/machine/setjmp.h (_JBLEN, AM33/2.0): Set to 26.
	* libc/machine/mn10300/setjmp.S (setjmp, longjmp): Save and
	restore callee-saved FP registers.

Index: newlib/libc/include/machine/setjmp.h
===================================================================
RCS file: /cvs/src/src/newlib/libc/include/machine/setjmp.h,v
retrieving revision 1.15
diff -u -p -r1.15 setjmp.h
--- newlib/libc/include/machine/setjmp.h 10 Jun 2003 15:32:27 -0000 1.15
+++ newlib/libc/include/machine/setjmp.h 10 Jul 2003 19:03:06 -0000
@@ -135,8 +135,12 @@ typedef int jmp_buf[_JBLEN];
 #endif
 
 #if defined(__mn10300__) || defined(__mn10200__)
+#ifdef __AM33_2__
+#define _JBLEN 26
+#else
 /* A guess */
 #define _JBLEN 10
+#endif
 #endif
 
 #ifdef __v850
Index: newlib/libc/machine/mn10300/setjmp.S
===================================================================
RCS file: /cvs/src/src/newlib/libc/machine/mn10300/setjmp.S,v
retrieving revision 1.2
diff -u -p -r1.2 setjmp.S
--- newlib/libc/machine/mn10300/setjmp.S 27 Apr 2000 10:49:16 -0000 1.2
+++ newlib/libc/machine/mn10300/setjmp.S 10 Jul 2003 19:03:06 -0000
@@ -6,6 +6,9 @@
 #ifdef __AM33__
 	.am33
 #endif
+#ifdef __AM33_2__
+	.am33_2
+#endif
 _setjmp:
         mov d0,a0
         mov d2,(0,a0)
@@ -22,6 +25,24 @@ _setjmp:
 	mov r5,(a0+)
 	mov r6,(a0+)
 	mov r7,(a0+)
+#ifdef __AM33_2__
+	fmov fs4,(a0+)
+	fmov fs5,(a0+)
+	fmov fs6,(a0+)
+	fmov fs7,(a0+)
+	fmov fs8,(a0+)
+	fmov fs9,(a0+)
+	fmov fs10,(a0+)
+	fmov fs11,(a0+)
+	fmov fs12,(a0+)
+	fmov fs13,(a0+)
+	fmov fs14,(a0+)
+	fmov fs15,(a0+)
+	fmov fs16,(a0+)
+	fmov fs17,(a0+)
+	fmov fs18,(a0+)
+	fmov fs19,(a0+)
+#endif
 #endif
         sub d0,d0
 	rets
@@ -43,6 +64,24 @@ _longjmp:
 	mov (a0+),r5
 	mov (a0+),r6
 	mov (a0+),r7
+#ifdef __AM33_2__
+	fmov (a0+),fs4
+	fmov (a0+),fs5
+	fmov (a0+),fs6
+	fmov (a0+),fs7
+	fmov (a0+),fs8
+	fmov (a0+),fs9
+	fmov (a0+),fs10
+	fmov (a0+),fs11
+	fmov (a0+),fs12
+	fmov (a0+),fs13
+	fmov (a0+),fs14
+	fmov (a0+),fs15
+	fmov (a0+),fs16
+	fmov (a0+),fs17
+	fmov (a0+),fs18
+	fmov (a0+),fs19
+#endif
 #endif
 	cmp 0,d1
 	bne L1
Index: libgloss/ChangeLog
from  Alexandre Oliva  <aoliva@redhat.com>

	2001-10-30  Jeff Johnston  <jjohnstn@redhat.com>
	* mn10300/asb2305.ld: Added ASB2305 support.
	* mn10300/configure: Ditto.
	* mn10300/configure.in: Ditto.
	2001-09-12  Stan Cox  <scox@redhat.com>
	* mn10300/asb2303.ld: New file.  Linker script for the ASB2303
	AM33/2.00 board.
	* mn10300/configure.in: Add support for asb2303 board script.

Index: libgloss/mn10300/asb2303.ld
===================================================================
RCS file: libgloss/mn10300/asb2303.ld
diff -N libgloss/mn10300/asb2303.ld
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libgloss/mn10300/asb2303.ld 10 Jul 2003 19:03:10 -0000
@@ -0,0 +1,150 @@
+/* Linker script for the MN10300 AM33/2.00 Panasonic ASB2303 Evaluation Board.
+*/
+
+OUTPUT_FORMAT("elf32-mn10300", "elf32-mn10300",
+	      "elf32-mn10300")
+OUTPUT_ARCH(mn10300)
+ENTRY(_start)
+GROUP(-lc -lcygmon -lgcc)
+ SEARCH_DIR(.);
+STARTUP(crt0_cygmon.o)
+
+/* Do we need any of these for elf?
+   __DYNAMIC = 0;    */
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  /* Start of RAM (leaving room for Cygmon data) */
+  . = 0x90080000;
+
+  .interp     : { *(.interp) 	}
+  .hash          : { *(.hash)		}
+  .dynsym        : { *(.dynsym)		}
+  .dynstr        : { *(.dynstr)		}
+  .gnu.version   : { *(.gnu.version)	}
+  .gnu.version_d   : { *(.gnu.version_d)	}
+  .gnu.version_r   : { *(.gnu.version_r)	}
+  .rel.text      :
+    { *(.rel.text) *(.rel.gnu.linkonce.t*) }
+  .rela.text     :
+    { *(.rela.text) *(.rela.gnu.linkonce.t*) }
+  .rel.data      :
+    { *(.rel.data) *(.rel.gnu.linkonce.d*) }
+  .rela.data     :
+    { *(.rela.data) *(.rela.gnu.linkonce.d*) }
+  .rel.rodata    :
+    { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
+  .rela.rodata   :
+    { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
+  .rel.got       : { *(.rel.got)		}
+  .rela.got      : { *(.rela.got)		}
+  .rel.ctors     : { *(.rel.ctors)	}
+  .rela.ctors    : { *(.rela.ctors)	}
+  .rel.dtors     : { *(.rel.dtors)	}
+  .rela.dtors    : { *(.rela.dtors)	}
+  .rel.init      : { *(.rel.init)	}
+  .rela.init     : { *(.rela.init)	}
+  .rel.fini      : { *(.rel.fini)	}
+  .rela.fini     : { *(.rela.fini)	}
+  .rel.bss       : { *(.rel.bss)		}
+  .rela.bss      : { *(.rela.bss)		}
+  .rel.plt       : { *(.rel.plt)		}
+  .rela.plt      : { *(.rela.plt)		}
+  .init          : { *(.init)	} =0
+  .plt      : { *(.plt)	}
+  .text      :
+  {
+    *(.text)
+    /* .gnu.warning sections are handled specially by elf32.em.  */
+    *(.gnu.warning)
+    *(.gnu.linkonce.t*)
+    *(.gcc_except_table)
+  } =0
+  _etext = .;
+  PROVIDE (etext = .);
+  .fini      : { *(.fini)    } =0
+  .rodata    : { *(.rodata) *(.gnu.linkonce.r*) }
+  .rodata1   : { *(.rodata1) }
+  /* Adjust the address for the data segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
+  . = ALIGN(1) + (. & (1 - 1));
+  .data    :
+  {
+    *(.data)
+    *(.gnu.linkonce.d*)
+    CONSTRUCTORS
+  }
+  .data1   : { *(.data1) }
+  .ctors         :
+  {
+    ___ctors = .;
+    KEEP(*crtbegin.o(.ctors))
+    KEEP(*(SORT(.ctors.*)))
+    KEEP(*(.ctors))
+    ___ctors_end = .;
+  }
+  .dtors         :
+  {
+    ___dtors = .;
+    KEEP(*crtbegin.o(.dtors))
+    KEEP(*(SORT(.dtors.*)))
+    KEEP(*(.dtors))
+    ___dtors_end = .;
+  }
+  .got           : { *(.got.plt) *(.got) }
+  .dynamic       : { *(.dynamic) }
+  /* We want the small data sections together, so single-instruction offsets
+     can access them all, and initialized data all before uninitialized, so
+     we can shorten the on-disk segment size.  */
+  .sdata     : { *(.sdata) }
+  _edata  =  .;
+  PROVIDE (edata = .);
+  __bss_start = .;
+  .sbss      : { *(.sbss) *(.scommon) }
+  .bss       :
+  {
+   *(.dynbss)
+   *(.bss)
+   *(COMMON)
+  }
+  _end = . ;
+  PROVIDE (end = .);
+  /* Stabs debugging sections.  */
+  .stab 0 : { *(.stab) }
+  .stabstr 0 : { *(.stabstr) }
+  .stab.excl 0 : { *(.stab.excl) }
+  .stab.exclstr 0 : { *(.stab.exclstr) }
+  .stab.index 0 : { *(.stab.index) }
+  .stab.indexstr 0 : { *(.stab.indexstr) }
+  .comment 0 : { *(.comment) }
+  /* DWARF debug sections.
+     Symbols in the DWARF debugging sections are relative to the beginning
+     of the section so we begin them at 0.  */
+  /* DWARF 1 */
+  .debug          0 : { *(.debug) }
+  .line           0 : { *(.line) }
+  /* GNU DWARF 1 extensions */
+  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+  .debug_sfnames  0 : { *(.debug_sfnames) }
+  /* DWARF 1.1 and DWARF 2 */
+  .debug_aranges  0 : { *(.debug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames) }
+  /* DWARF 2 */
+  .debug_info     0 : { *(.debug_info) }
+  .debug_abbrev   0 : { *(.debug_abbrev) }
+  .debug_line     0 : { *(.debug_line) }
+  .debug_frame    0 : { *(.debug_frame) }
+  .debug_str      0 : { *(.debug_str) }
+  .debug_loc      0 : { *(.debug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo) }
+  /* SGI/MIPS DWARF 2 extensions */
+  .debug_weaknames 0 : { *(.debug_weaknames) }
+  .debug_funcnames 0 : { *(.debug_funcnames) }
+  .debug_typenames 0 : { *(.debug_typenames) }
+  .debug_varnames  0 : { *(.debug_varnames) }
+
+   /* Top of RAM is 0x48100000, but Cygmon uses the top 4K for its stack.  */
+  .stack 0x480ff000 : { _stack = .; *(.stack) *(._stack) }
+
+  /* These must appear regardless of  .  */
+}
Index: libgloss/mn10300/asb2305.ld
===================================================================
RCS file: libgloss/mn10300/asb2305.ld
diff -N libgloss/mn10300/asb2305.ld
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libgloss/mn10300/asb2305.ld 10 Jul 2003 19:03:10 -0000
@@ -0,0 +1,150 @@
+/* Linker script for the MN10300 AM33/2.00 Panasonic ASB2305 Evaluation Board.
+*/
+
+OUTPUT_FORMAT("elf32-mn10300", "elf32-mn10300",
+	      "elf32-mn10300")
+OUTPUT_ARCH(am33-2)
+ENTRY(_start)
+GROUP(-lc -lcygmon -lgcc)
+ SEARCH_DIR(.);
+STARTUP(crt0_redboot.o)
+
+/* Do we need any of these for elf?
+   __DYNAMIC = 0;    */
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  /* Start of RAM (leaving room for RedBoot data) */
+  . = 0x90700000;
+
+  .interp     : { *(.interp) 	}
+  .hash          : { *(.hash)		}
+  .dynsym        : { *(.dynsym)		}
+  .dynstr        : { *(.dynstr)		}
+  .gnu.version   : { *(.gnu.version)	}
+  .gnu.version_d   : { *(.gnu.version_d)	}
+  .gnu.version_r   : { *(.gnu.version_r)	}
+  .rel.text      :
+    { *(.rel.text) *(.rel.gnu.linkonce.t*) }
+  .rela.text     :
+    { *(.rela.text) *(.rela.gnu.linkonce.t*) }
+  .rel.data      :
+    { *(.rel.data) *(.rel.gnu.linkonce.d*) }
+  .rela.data     :
+    { *(.rela.data) *(.rela.gnu.linkonce.d*) }
+  .rel.rodata    :
+    { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
+  .rela.rodata   :
+    { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
+  .rel.got       : { *(.rel.got)		}
+  .rela.got      : { *(.rela.got)		}
+  .rel.ctors     : { *(.rel.ctors)	}
+  .rela.ctors    : { *(.rela.ctors)	}
+  .rel.dtors     : { *(.rel.dtors)	}
+  .rela.dtors    : { *(.rela.dtors)	}
+  .rel.init      : { *(.rel.init)	}
+  .rela.init     : { *(.rela.init)	}
+  .rel.fini      : { *(.rel.fini)	}
+  .rela.fini     : { *(.rela.fini)	}
+  .rel.bss       : { *(.rel.bss)		}
+  .rela.bss      : { *(.rela.bss)		}
+  .rel.plt       : { *(.rel.plt)		}
+  .rela.plt      : { *(.rela.plt)		}
+  .init          : { *(.init)	} =0
+  .plt      : { *(.plt)	}
+  .text      :
+  {
+    *(.text)
+    /* .gnu.warning sections are handled specially by elf32.em.  */
+    *(.gnu.warning)
+    *(.gnu.linkonce.t*)
+    *(.gcc_except_table)
+  } =0
+  _etext = .;
+  PROVIDE (etext = .);
+  .fini      : { *(.fini)    } =0
+  .rodata    : { *(.rodata) *(.gnu.linkonce.r*) }
+  .rodata1   : { *(.rodata1) }
+  /* Adjust the address for the data segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
+  . = ALIGN(1) + (. & (1 - 1));
+  .data    :
+  {
+    *(.data)
+    *(.gnu.linkonce.d*)
+    CONSTRUCTORS
+  }
+  .data1   : { *(.data1) }
+  .ctors         :
+  {
+    ___ctors = .;
+    KEEP(*crtbegin.o(.ctors))
+    KEEP(*(SORT(.ctors.*)))
+    KEEP(*(.ctors))
+    ___ctors_end = .;
+  }
+  .dtors         :
+  {
+    ___dtors = .;
+    KEEP(*crtbegin.o(.dtors))
+    KEEP(*(SORT(.dtors.*)))
+    KEEP(*(.dtors))
+    ___dtors_end = .;
+  }
+  .got           : { *(.got.plt) *(.got) }
+  .dynamic       : { *(.dynamic) }
+  /* We want the small data sections together, so single-instruction offsets
+     can access them all, and initialized data all before uninitialized, so
+     we can shorten the on-disk segment size.  */
+  .sdata     : { *(.sdata) }
+  _edata  =  .;
+  PROVIDE (edata = .);
+  __bss_start = .;
+  .sbss      : { *(.sbss) *(.scommon) }
+  .bss       :
+  {
+   *(.dynbss)
+   *(.bss)
+   *(COMMON)
+  }
+  _end = . ;
+  PROVIDE (end = .);
+  /* Stabs debugging sections.  */
+  .stab 0 : { *(.stab) }
+  .stabstr 0 : { *(.stabstr) }
+  .stab.excl 0 : { *(.stab.excl) }
+  .stab.exclstr 0 : { *(.stab.exclstr) }
+  .stab.index 0 : { *(.stab.index) }
+  .stab.indexstr 0 : { *(.stab.indexstr) }
+  .comment 0 : { *(.comment) }
+  /* DWARF debug sections.
+     Symbols in the DWARF debugging sections are relative to the beginning
+     of the section so we begin them at 0.  */
+  /* DWARF 1 */
+  .debug          0 : { *(.debug) }
+  .line           0 : { *(.line) }
+  /* GNU DWARF 1 extensions */
+  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+  .debug_sfnames  0 : { *(.debug_sfnames) }
+  /* DWARF 1.1 and DWARF 2 */
+  .debug_aranges  0 : { *(.debug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames) }
+  /* DWARF 2 */
+  .debug_info     0 : { *(.debug_info) }
+  .debug_abbrev   0 : { *(.debug_abbrev) }
+  .debug_line     0 : { *(.debug_line) }
+  .debug_frame    0 : { *(.debug_frame) }
+  .debug_str      0 : { *(.debug_str) }
+  .debug_loc      0 : { *(.debug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo) }
+  /* SGI/MIPS DWARF 2 extensions */
+  .debug_weaknames 0 : { *(.debug_weaknames) }
+  .debug_funcnames 0 : { *(.debug_funcnames) }
+  .debug_typenames 0 : { *(.debug_typenames) }
+  .debug_varnames  0 : { *(.debug_varnames) }
+
+   /* Top of usable RAM is 0x91000000  */
+  .stack 0x91000000 : { _stack = .; *(.stack) *(._stack) }
+
+  /* These must appear regardless of  .  */
+}
Index: libgloss/mn10300/configure
===================================================================
RCS file: /cvs/src/src/libgloss/mn10300/configure,v
retrieving revision 1.3
diff -u -p -r1.3 configure
--- libgloss/mn10300/configure 25 Oct 2002 19:00:54 -0000 1.3
+++ libgloss/mn10300/configure 10 Jul 2003 19:03:11 -0000
@@ -908,6 +908,11 @@ fi
 
 
 case "${target}" in
+  mn10300-*elf)
+        part_specific_obj=vr4300.o
+        script_list="eval sim asb2303 asb2305"
+        bsp_list="libeval.a libcygmon.a"
+        ;;
   *)
         part_specific_obj=vr4300.o
         script_list="eval sim"
Index: libgloss/mn10300/configure.in
===================================================================
RCS file: /cvs/src/src/libgloss/mn10300/configure.in,v
retrieving revision 1.2
diff -u -p -r1.2 configure.in
--- libgloss/mn10300/configure.in 31 Oct 2001 19:19:08 -0000 1.2
+++ libgloss/mn10300/configure.in 10 Jul 2003 19:03:11 -0000
@@ -83,6 +83,11 @@ AC_SUBST(LD)
 AC_PROG_RANLIB
 
 case "${target}" in
+  mn10300-*elf)
+        part_specific_obj=vr4300.o
+        script_list="eval sim asb2303 asb2305"
+        bsp_list="libeval.a libcygmon.a"
+        ;;
   *)
         part_specific_obj=vr4300.o
         script_list="eval sim"
-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                 aoliva@{redhat.com, gcc.gnu.org}
CS PhD student at IC-Unicamp        oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist                Professional serial bug killer

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]