From 34a2ec924d4300ff22504d1740d2bcd3c7acdb18 Mon Sep 17 00:00:00 2001 From: Ralph Holmes Date: Sat, 19 Dec 2015 16:07:54 +0000 Subject: avr/avrtest: Remove (obselete). Updates #2442. --- c/src/lib/libbsp/avr/acinclude.m4 | 2 - c/src/lib/libbsp/avr/avrtest/Makefile.am | 47 --- c/src/lib/libbsp/avr/avrtest/README | 33 -- c/src/lib/libbsp/avr/avrtest/bsp_specs | 15 - c/src/lib/libbsp/avr/avrtest/configure.ac | 20 -- c/src/lib/libbsp/avr/avrtest/console/console-io.c | 68 ---- c/src/lib/libbsp/avr/avrtest/include/bsp.h | 37 --- .../avr/avrtest/make/custom/avrtest-testsuite.tcfg | 12 - .../lib/libbsp/avr/avrtest/make/custom/avrtest.cfg | 15 - c/src/lib/libbsp/avr/avrtest/preinstall.am | 71 ---- c/src/lib/libbsp/avr/avrtest/start/macros.inc | 364 --------------------- c/src/lib/libbsp/avr/avrtest/start/start.S | 291 ---------------- c/src/lib/libbsp/avr/avrtest/startup/linkcmds | 241 -------------- 13 files changed, 1216 deletions(-) delete mode 100644 c/src/lib/libbsp/avr/avrtest/Makefile.am delete mode 100644 c/src/lib/libbsp/avr/avrtest/README delete mode 100644 c/src/lib/libbsp/avr/avrtest/bsp_specs delete mode 100644 c/src/lib/libbsp/avr/avrtest/configure.ac delete mode 100644 c/src/lib/libbsp/avr/avrtest/console/console-io.c delete mode 100644 c/src/lib/libbsp/avr/avrtest/include/bsp.h delete mode 100644 c/src/lib/libbsp/avr/avrtest/make/custom/avrtest-testsuite.tcfg delete mode 100644 c/src/lib/libbsp/avr/avrtest/make/custom/avrtest.cfg delete mode 100644 c/src/lib/libbsp/avr/avrtest/preinstall.am delete mode 100644 c/src/lib/libbsp/avr/avrtest/start/macros.inc delete mode 100644 c/src/lib/libbsp/avr/avrtest/start/start.S delete mode 100644 c/src/lib/libbsp/avr/avrtest/startup/linkcmds diff --git a/c/src/lib/libbsp/avr/acinclude.m4 b/c/src/lib/libbsp/avr/acinclude.m4 index fead999a77..296a6f7882 100644 --- a/c/src/lib/libbsp/avr/acinclude.m4 +++ b/c/src/lib/libbsp/avr/acinclude.m4 @@ -2,8 +2,6 @@ AC_DEFUN([RTEMS_CHECK_BSPDIR], [ case "$1" in - avrtest ) - AC_CONFIG_SUBDIRS([avrtest]);; *) AC_MSG_ERROR([Invalid BSP]);; esac diff --git a/c/src/lib/libbsp/avr/avrtest/Makefile.am b/c/src/lib/libbsp/avr/avrtest/Makefile.am deleted file mode 100644 index c164339b86..0000000000 --- a/c/src/lib/libbsp/avr/avrtest/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -ACLOCAL_AMFLAGS = -I ../../../../aclocal - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../bsp.am - -include_bspdir = $(includedir)/bsp - -dist_project_lib_DATA = bsp_specs - -include_HEADERS = include/bsp.h -include_HEADERS += ../../shared/include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h -nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h -DISTCLEANFILES = include/bspopts.h -noinst_PROGRAMS = - -nodist_include_HEADERS += ../../shared/include/coverhd.h - -EXTRA_DIST = start/start.S -start.$(OBJEXT): start/start.S - $(CPPASCOMPILE) -o $@ -c $< -project_lib_DATA = start.$(OBJEXT) - -dist_project_lib_DATA += startup/linkcmds - -startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ - ../../shared/bsppredriverhook.c \ - ../../shared/bspgetworkarea.c ../../shared/bsppost.c \ - ../../shared/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \ - ../../shared/gnatinstallhandler.c -clock_SOURCES = ../../shared/clock_driver_simidle.c -console_SOURCES = ../../shared/console-polled.c console/console-io.c -timer_SOURCES = ../../shared/timerstub.c - -noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ - $(timer_SOURCES) - -# Cache -libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c -libbsp_a_SOURCES += ../../shared/include/cache_.h -libbsp_a_CPPFLAGS = -I$(srcdir)/../../shared/include - -include $(srcdir)/preinstall.am -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/avr/avrtest/README b/c/src/lib/libbsp/avr/avrtest/README deleted file mode 100644 index ac097e4dbd..0000000000 --- a/c/src/lib/libbsp/avr/avrtest/README +++ /dev/null @@ -1,33 +0,0 @@ -This BSP is designed to operate on the AVR Mega128 variants. - -It has been run on AVRTEST and SIMULAVRXX simulators. - - -AVRTEST: - -Download from sourceforge.net: - -cvs -d:pserver:anonymous@winavr.cvs.sourceforge.net:/cvsroot/winavr login -cvs -z3 -d:pserver:anonymous@winavr.cvs.sourceforge.net:/cvsroot/winavr \ - co -P avrtest - - -SIMULAVRXX: - -Download from http://savannah.nongnu.org/projects/simulavr/ - -CVS is the only way to get the source at this time. Check project home page for updates. - -cvs -z3 -d:pserver:anonymous@cvs.savannah.nongnu.org:/sources/simulavr co simulavrxx - -here is an example of using simulavrxx with the hello world test example. - -while in .../samples/hello - -simulavr -d atmega128 -f hello.exe -W0x52,/dev/stderr -Texit - -to get the help page: - -simulavr -h - - diff --git a/c/src/lib/libbsp/avr/avrtest/bsp_specs b/c/src/lib/libbsp/avr/avrtest/bsp_specs deleted file mode 100644 index 5457e23a4d..0000000000 --- a/c/src/lib/libbsp/avr/avrtest/bsp_specs +++ /dev/null @@ -1,15 +0,0 @@ -%rename endfile old_endfile -%rename startfile old_startfile -%rename link old_link - -*startfile: -%{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s -e __init}} - -*endfile: -%{!qrtems: %(old_endfile)} \ -%{!nostdlib: %{qrtems:}} - -*link: -%(old_link) %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} - diff --git a/c/src/lib/libbsp/avr/avrtest/configure.ac b/c/src/lib/libbsp/avr/avrtest/configure.ac deleted file mode 100644 index 7b18258c26..0000000000 --- a/c/src/lib/libbsp/avr/avrtest/configure.ac +++ /dev/null @@ -1,20 +0,0 @@ -## Process this file with autoconf to produce a configure script. - -AC_PREREQ([2.69]) -AC_INIT([rtems-c-src-lib-libbsp-h8300-h8sim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) -AC_CONFIG_SRCDIR([bsp_specs]) -RTEMS_TOP(../../../../../..) - -RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) -RTEMS_BSP_CONFIGURE - -RTEMS_PROG_CC_FOR_TARGET -RTEMS_CANONICALIZE_TOOLS -RTEMS_PROG_CCAS - -RTEMS_BSP_CLEANUP_OPTIONS(0, 0) - -# Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/c/src/lib/libbsp/avr/avrtest/console/console-io.c b/c/src/lib/libbsp/avr/avrtest/console/console-io.c deleted file mode 100644 index f02ad5dfb6..0000000000 --- a/c/src/lib/libbsp/avr/avrtest/console/console-io.c +++ /dev/null @@ -1,68 +0,0 @@ -/* - * This file contains the hardware specific portions of the TTY driver - * for the serial ports on the avr. - */ - -/* - * COPYRIGHT (c) 1989-2008. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#include -#include -#include -#include -#include - -#define STDIO_PORT 0x52 -#define EXIT_PORT 0x4F -#define ABORT_PORT 0x49 - -/* - * console_initialize_hardware - * - * This routine initializes the console hardware. - * - */ - -void console_initialize_hardware(void) -{ - return; -} - -/* - * console_outbyte_polled - * - * This routine transmits a character using polling. - */ -void console_outbyte_polled( - int port, - char ch -) -{ - *((volatile unsigned char *) STDIO_PORT) = ch; -} - -/* - * console_inbyte_nonblocking - * - * This routine polls for a character. - */ - -int console_inbyte_nonblocking( - int port -) -{ - return -1; -} - -#include - -static void AVRsimBSP_output_char(char c) { console_outbyte_polled( 0, c ); } - -BSP_output_char_function_type BSP_output_char = AVRsimBSP_output_char; -BSP_polling_getchar_function_type BSP_poll_char = NULL; diff --git a/c/src/lib/libbsp/avr/avrtest/include/bsp.h b/c/src/lib/libbsp/avr/avrtest/include/bsp.h deleted file mode 100644 index 1a1613981d..0000000000 --- a/c/src/lib/libbsp/avr/avrtest/include/bsp.h +++ /dev/null @@ -1,37 +0,0 @@ -/* bsp.h - * - * This include file contains some definitions specific to the - * h8 simulator in gdb. - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#ifndef LIBBSP_AVR_AVRTEST_BSP_H -#define LIBBSP_AVR_AVRTEST_BSP_H - -#include -#include - -#include -#include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/* support for simulated clock tick */ -Thread clock_driver_sim_idle_body(uintptr_t); -#define BSP_IDLE_TASK_BODY clock_driver_sim_idle_body - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/c/src/lib/libbsp/avr/avrtest/make/custom/avrtest-testsuite.tcfg b/c/src/lib/libbsp/avr/avrtest/make/custom/avrtest-testsuite.tcfg deleted file mode 100644 index 91d7c1bbfd..0000000000 --- a/c/src/lib/libbsp/avr/avrtest/make/custom/avrtest-testsuite.tcfg +++ /dev/null @@ -1,12 +0,0 @@ -# -# The GDB AVR Simulator does not have a tick interrupt. -# - -include: testdata/require-tick-isr.tcfg -include: testdata/disable-jffs2-tests.tcfg -include: testdata/disable-mrfs-tests.tcfg - -capture01 -fsbdpart01 -fsdosfsformat01 -fsdosfswrite01 diff --git a/c/src/lib/libbsp/avr/avrtest/make/custom/avrtest.cfg b/c/src/lib/libbsp/avr/avrtest/make/custom/avrtest.cfg deleted file mode 100644 index e4857cd2ff..0000000000 --- a/c/src/lib/libbsp/avr/avrtest/make/custom/avrtest.cfg +++ /dev/null @@ -1,15 +0,0 @@ -# -# Config file for the AVR ATmega128 on avrtest Simulator -# - -include $(RTEMS_ROOT)/make/custom/default.cfg - -RTEMS_CPU=avr -RTEMS_CPU_MODEL=mega128 - -# This contains the compiler options necessary to select the CPU model -# and (hopefully) optimize for it. -CPU_CFLAGS = -mmcu=atmega128 - -# optimize flag: typically -O2 -CFLAGS_OPTIMIZE_V = -Os -g diff --git a/c/src/lib/libbsp/avr/avrtest/preinstall.am b/c/src/lib/libbsp/avr/avrtest/preinstall.am deleted file mode 100644 index f3d7d235a6..0000000000 --- a/c/src/lib/libbsp/avr/avrtest/preinstall.am +++ /dev/null @@ -1,71 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - -PREINSTALL_DIRS = -DISTCLEANFILES += $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - -all-local: $(TMPINSTALL_FILES) - -TMPINSTALL_FILES = -CLEANFILES += $(TMPINSTALL_FILES) - -$(PROJECT_LIB)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_INCLUDE)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE) - @: > $(PROJECT_INCLUDE)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) - -$(PROJECT_INCLUDE)/bsp/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp - @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) - -$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs -PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs - -$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h - -$(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h - -$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h - -$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h - -$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h - -$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h - -$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) - -$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - diff --git a/c/src/lib/libbsp/avr/avrtest/start/macros.inc b/c/src/lib/libbsp/avr/avrtest/start/macros.inc deleted file mode 100644 index ddeb85d366..0000000000 --- a/c/src/lib/libbsp/avr/avrtest/start/macros.inc +++ /dev/null @@ -1,364 +0,0 @@ -/* Copyright (c) 2002, 2005, 2006, 2007 Marek Michalkiewicz - Copyright (c) 2006 Dmitry Xmelkov - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - * Neither the name of the copyright holders nor the names of - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. */ - -/* - macros.inc - macros for use in assembler sources - - Contributors: - Created by Marek Michalkiewicz - */ - -#include - -/* if not defined, assume old version with underscores */ -#ifndef __USER_LABEL_PREFIX__ -#define __USER_LABEL_PREFIX__ _ -#endif - -#ifndef __REGISTER_PREFIX__ -#define __REGISTER_PREFIX__ -#endif - -/* the assembler line separator (just in case it ever changes) */ -#define _L $ - -#define CONCAT1(a, b) CONCAT2(a, b) -#define CONCAT2(a, b) a ## b - -#define _U(x) CONCAT1(__USER_LABEL_PREFIX__, x) - -#define _R(x) CONCAT1(__REGISTER_PREFIX__, x) - -/* these should help to fix the "can't have function named r1()" bug - which may require adding '%' in front of register names. */ - -#define r0 _R(r0) -#define r1 _R(r1) -#define r2 _R(r2) -#define r3 _R(r3) -#define r4 _R(r4) -#define r5 _R(r5) -#define r6 _R(r6) -#define r7 _R(r7) -#define r8 _R(r8) -#define r9 _R(r9) -#define r10 _R(r10) -#define r11 _R(r11) -#define r12 _R(r12) -#define r13 _R(r13) -#define r14 _R(r14) -#define r15 _R(r15) -#define r16 _R(r16) -#define r17 _R(r17) -#define r18 _R(r18) -#define r19 _R(r19) -#define r20 _R(r20) -#define r21 _R(r21) -#define r22 _R(r22) -#define r23 _R(r23) -#define r24 _R(r24) -#define r25 _R(r25) -#define r26 _R(r26) -#define r27 _R(r27) -#define r28 _R(r28) -#define r29 _R(r29) -#define r30 _R(r30) -#define r31 _R(r31) - -#ifndef __tmp_reg__ -#define __tmp_reg__ r0 -#endif - -#ifndef __zero_reg__ -#define __zero_reg__ r1 -#endif - -#if __AVR_MEGA__ - #define XJMP jmp - #define XCALL call -#else - #define XJMP rjmp - #define XCALL rcall -#endif - -/* used only by fplib/strtod.S - libgcc internal function calls */ -#define PROLOGUE_SAVES(offset) XJMP (__prologue_saves__ + 2 * (offset)) -#define EPILOGUE_RESTORES(offset) XJMP (__epilogue_restores__ + 2 * (offset)) - -#if FLASHEND > 0x10000 /* ATmega103 */ - #define BIG_CODE 1 -#else - #define BIG_CODE 0 -#endif - -#ifndef __AVR_HAVE_MOVW__ -# if defined(__AVR_ENHANCED__) && __AVR_ENHANCED__ -# define __AVR_HAVE_MOVW__ 1 -# endif -#endif - -#ifndef __AVR_HAVE_LPMX__ -# if defined(__AVR_ENHANCED__) && __AVR_ENHANCED__ -# define __AVR_HAVE_LPMX__ 1 -# endif -#endif - -#ifndef __AVR_HAVE_MUL__ -# if defined(__AVR_ENHANCED__) && __AVR_ENHANCED__ -# define __AVR_HAVE_MUL__ 1 -# endif -#endif - -/* - Smart version of movw: - - uses "movw" if possible (supported by MCU, and both registers even) - - handles overlapping register pairs correctly - - no instruction generated if source and destination are the same - (may expand to 0, 1 or 2 instructions). - */ - -.macro X_movw dst src - .L_movw_dst = -1 - .L_movw_src = -1 - .L_movw_n = 0 - .irp reg, r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, \ - r10,r11,r12,r13,r14,r15,r16,r17,r18,r19, \ - r20,r21,r22,r23,r24,r25,r26,r27,r28,r29, \ - r30,r31 - .ifc \reg,\dst - .L_movw_dst = .L_movw_n - .endif - .ifc \reg,\src - .L_movw_src = .L_movw_n - .endif - .L_movw_n = .L_movw_n + 1 - .endr - .L_movw_n = 0 - .irp reg, R0, R1, R2, R3, R4, R5, R6, R7, R8, R9, \ - R10,R11,R12,R13,R14,R15,R16,R17,R18,R19, \ - R20,R21,R22,R23,R24,R25,R26,R27,R28,R29, \ - R30,R31 - .ifc \reg,\dst - .L_movw_dst = .L_movw_n - .endif - .ifc \reg,\src - .L_movw_src = .L_movw_n - .endif - .L_movw_n = .L_movw_n + 1 - .endr - .if .L_movw_dst < 0 - .L_movw_n = 0 - .rept 32 - .if \dst == .L_movw_n - .L_movw_dst = .L_movw_n - .endif - .L_movw_n = .L_movw_n + 1 - .endr - .endif - .if .L_movw_src < 0 - .L_movw_n = 0 - .rept 32 - .if \src == .L_movw_n - .L_movw_src = .L_movw_n - .endif - .L_movw_n = .L_movw_n + 1 - .endr - .endif - .if (.L_movw_dst < 0) || (.L_movw_src < 0) - .err ; Invalid 'X_movw' arg. - .endif - - .if ((.L_movw_src) - (.L_movw_dst)) /* different registers */ - .if (((.L_movw_src) | (.L_movw_dst)) & 0x01) - .if (((.L_movw_src)-(.L_movw_dst)) & 0x80) /* src < dest */ - mov (.L_movw_dst)+1, (.L_movw_src)+1 - mov (.L_movw_dst), (.L_movw_src) - .else /* src > dest */ - mov (.L_movw_dst), (.L_movw_src) - mov (.L_movw_dst)+1, (.L_movw_src)+1 - .endif - .else /* both even -> overlap not possible */ -#if defined(__AVR_HAVE_MOVW__) && __AVR_HAVE_MOVW__ - movw \dst, \src -#else - mov (.L_movw_dst), (.L_movw_src) - mov (.L_movw_dst)+1, (.L_movw_src)+1 -#endif - .endif - .endif -.endm - -/* Macro 'X_lpm' extends enhanced lpm instruction for classic chips. - Usage: - X_lpm reg, dst - where - reg is 0..31, r0..r31 or R0..R31 - dst is z, Z, z+ or Z+ - It is possible to omit both arguments. - - Possible results for classic chips: - lpm - lpm / mov Rd,r0 - lpm / adiw ZL,1 - lpm / mov Rd,r0 / adiw ZL,1 - - For enhanced chips it is one instruction always. - - ATTENTION: unlike enhanced chips SREG (S,V,N,Z,C) flags are - changed in case of 'Z+' dst. R0 is scratch. - */ -.macro X_lpm dst=r0, src=Z - - /* dst evaluation */ - .L_lpm_dst = -1 - - .L_lpm_n = 0 - .irp reg, r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, \ - r10,r11,r12,r13,r14,r15,r16,r17,r18,r19, \ - r20,r21,r22,r23,r24,r25,r26,r27,r28,r29, \ - r30,r31 - .ifc \reg,\dst - .L_lpm_dst = .L_lpm_n - .endif - .L_lpm_n = .L_lpm_n + 1 - .endr - - .L_lpm_n = 0 - .irp reg, R0, R1, R2, R3, R4, R5, R6, R7, R8, R9, \ - R10,R11,R12,R13,R14,R15,R16,R17,R18,R19, \ - R20,R21,R22,R23,R24,R25,R26,R27,R28,R29, \ - R30,R31 - .ifc \reg,\dst - .L_lpm_dst = .L_lpm_n - .endif - .L_lpm_n = .L_lpm_n + 1 - .endr - - .if .L_lpm_dst < 0 - .L_lpm_n = 0 - .rept 32 - .if \dst == .L_lpm_n - .L_lpm_dst = .L_lpm_n - .endif - .L_lpm_n = .L_lpm_n + 1 - .endr - .endif - - .if (.L_lpm_dst < 0) - .err ; Invalid dst arg of 'X_lpm' macro. - .endif - - /* src evaluation */ - .L_lpm_src = -1 - .L_lpm_n = 0 - .irp reg, z,Z,z+,Z+ - .ifc \reg,\src - .L_lpm_src = .L_lpm_n - .endif - .L_lpm_n = .L_lpm_n + 1 - .endr - - .if (.L_lpm_src < 0) - .err ; Invalid src arg of 'X_lpm' macro. - .endif - - /* instruction(s) */ - .if .L_lpm_src < 2 - .if .L_lpm_dst == 0 - lpm - .else -#if defined(__AVR_HAVE_LPMX__) && __AVR_HAVE_LPMX__ - lpm .L_lpm_dst, Z -#else - lpm - mov .L_lpm_dst, r0 -#endif - .endif - .else - .if (.L_lpm_dst >= 30) - .err ; Registers 30 and 31 are inhibited as 'X_lpm *,Z+' dst. - .endif -#if defined(__AVR_HAVE_LPMX__) && __AVR_HAVE_LPMX__ - lpm .L_lpm_dst, Z+ -#else - lpm - .if .L_lpm_dst - mov .L_lpm_dst, r0 - .endif - adiw r30, 1 -#endif - .endif -.endm - -/* - LPM_R0_ZPLUS_INIT is used before the loop to initialize RAMPZ - for future devices with RAMPZ:Z auto-increment - [e]lpm r0, Z+. - - LPM_R0_ZPLUS_NEXT is used inside the loop to load a byte from - the program memory at [RAMPZ:]Z to R0, and increment [RAMPZ:]Z. - - The argument in both macros is a register that contains the - high byte (bits 23-16) of the address, bits 15-0 should be in - the Z (r31:r30) register. It can be any register except for: - r0, r1 (__zero_reg__ - assumed to always contain 0), r30, r31. - */ - - .macro LPM_R0_ZPLUS_INIT hhi -#if __AVR_ENHANCED__ - #if BIG_CODE - out AVR_RAMPZ_ADDR, \hhi - #endif -#endif - .endm - - .macro LPM_R0_ZPLUS_NEXT hhi -#if __AVR_ENHANCED__ - #if BIG_CODE - /* ELPM with RAMPZ:Z post-increment, load RAMPZ only once */ - elpm r0, Z+ - #else - /* LPM with Z post-increment, max 64K, no RAMPZ (ATmega83/161/163/32) */ - lpm r0, Z+ - #endif -#else - #if BIG_CODE - /* ELPM without post-increment, load RAMPZ each time (ATmega103) */ - out AVR_RAMPZ_ADDR, \hhi - elpm - adiw r30,1 - adc \hhi, __zero_reg__ - #else - /* LPM without post-increment, max 64K, no RAMPZ (AT90S*) */ - lpm - adiw r30,1 - #endif -#endif - .endm diff --git a/c/src/lib/libbsp/avr/avrtest/start/start.S b/c/src/lib/libbsp/avr/avrtest/start/start.S deleted file mode 100644 index 22853a26b3..0000000000 --- a/c/src/lib/libbsp/avr/avrtest/start/start.S +++ /dev/null @@ -1,291 +0,0 @@ -/* Copyright (c) 2002, Marek Michalkiewicz - Copyright (c) 2007, Eric B. Weddington - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - * Neither the name of the copyright holders nor the names of - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. */ - - -#if (__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 3) -#error "GCC version >= 3.3 required" -#endif - -#include "macros.inc" - - .macro vector name - .if (. - __vectors < _VECTORS_SIZE) - .weak \name - .set \name, __bad_interrupt - XJMP \name - .endif - .endm - - .section .vectors,"ax",@progbits - .global __vectors - .func __vectors -__vectors: - XJMP __init - vector __vector_1 - vector __vector_2 - vector __vector_3 - vector __vector_4 - vector __vector_5 - vector __vector_6 - vector __vector_7 - vector __vector_8 - vector __vector_9 - vector __vector_10 - vector __vector_11 - vector __vector_12 - vector __vector_13 - vector __vector_14 - vector __vector_15 - vector __vector_16 - vector __vector_17 - vector __vector_18 - vector __vector_19 - vector __vector_20 - vector __vector_21 - vector __vector_22 - vector __vector_23 - vector __vector_24 - vector __vector_25 - vector __vector_26 - vector __vector_27 - vector __vector_28 - vector __vector_29 - vector __vector_30 - vector __vector_31 - vector __vector_32 - vector __vector_33 - vector __vector_34 - vector __vector_35 - vector __vector_36 - vector __vector_37 - vector __vector_38 - vector __vector_39 - vector __vector_40 - vector __vector_41 - vector __vector_42 - vector __vector_43 - vector __vector_44 - vector __vector_45 - vector __vector_46 - vector __vector_47 - vector __vector_48 - vector __vector_49 - vector __vector_50 - vector __vector_51 - vector __vector_52 - vector __vector_53 - vector __vector_54 - vector __vector_55 - vector __vector_56 - vector __vector_57 - vector __vector_58 - vector __vector_59 - vector __vector_60 - vector __vector_61 - vector __vector_62 - vector __vector_63 - vector __vector_64 - vector __vector_65 - vector __vector_66 - vector __vector_67 - vector __vector_68 - vector __vector_69 - vector __vector_70 - vector __vector_71 - vector __vector_72 - vector __vector_73 - vector __vector_74 - vector __vector_75 - vector __vector_76 - vector __vector_77 - vector __vector_78 - vector __vector_79 - vector __vector_80 - vector __vector_81 - vector __vector_82 - vector __vector_83 - vector __vector_84 - vector __vector_85 - vector __vector_86 - vector __vector_87 - vector __vector_88 - vector __vector_89 - vector __vector_90 - vector __vector_91 - vector __vector_92 - vector __vector_93 - vector __vector_94 - vector __vector_95 - vector __vector_96 - vector __vector_97 - vector __vector_98 - vector __vector_99 - vector __vector_100 - vector __vector_101 - vector __vector_102 - vector __vector_103 - vector __vector_104 - vector __vector_105 - vector __vector_106 - vector __vector_107 - vector __vector_108 - vector __vector_109 - vector __vector_110 - vector __vector_111 - vector __vector_112 - vector __vector_113 - vector __vector_114 - vector __vector_115 - vector __vector_116 - vector __vector_117 - vector __vector_118 - vector __vector_119 - vector __vector_120 - vector __vector_121 - vector __vector_122 - vector __vector_123 - vector __vector_124 - vector __vector_125 - .endfunc - - /* Handle unexpected interrupts (enabled and no handler), which - usually indicate a bug. Jump to the __vector_default function - if defined by the user, otherwise jump to the reset address. - - This must be in a different section, otherwise the assembler - will resolve "rjmp" offsets and there will be no relocs. */ - - .text - .global __bad_interrupt - .func __bad_interrupt -__bad_interrupt: - .weak __vector_default - .set __vector_default, __vectors - XJMP __vector_default - .endfunc - - .section .init0,"ax",@progbits - .weak __init -; .func __init -__init: - -#ifndef __AVR_ASM_ONLY__ - .weak __stack - - /* By default, malloc() uses the current value of the stack pointer - minus __malloc_margin as the highest available address. - - In some applications with external SRAM, the stack can be below - the data section (in the internal SRAM - faster), and __heap_end - should be set to the highest address available for malloc(). */ - .weak __heap_end - .set __heap_end, 0 - - .section .init2,"ax",@progbits - clr __zero_reg__ - out AVR_STATUS_ADDR, __zero_reg__ - ldi r28,lo8(__stack) -#ifdef _HAVE_AVR_STACK_POINTER_HI - ldi r29,hi8(__stack) - out AVR_STACK_POINTER_HI_ADDR, r29 -#endif /* _HAVE_AVR_STACK_POINTER_HI */ - out AVR_STACK_POINTER_LO_ADDR, r28 - -#ifdef __AVR_3_BYTE_PC__ - ldi r16, hh8(pm(__vectors)) - out _SFR_IO_ADDR(EIND), r16 -#endif /* __AVR_3_BYTE_PC__ */ - -#ifdef __AVR_HAVE_RAMPD__ - out AVR_RAMPD_ADDR, __zero_reg__ - out AVR_RAMPX_ADDR, __zero_reg__ - out AVR_RAMPY_ADDR, __zero_reg__ - out AVR_RAMPZ_ADDR, __zero_reg__ -#endif - -#if BIG_CODE - /* Only for >64K devices with RAMPZ, replaces the default code - provided by libgcc.S which is only linked in if necessary. */ - - .section .init4,"ax",@progbits - .global __do_copy_data -__do_copy_data: - ldi r17, hi8(__data_end) - ldi r26, lo8(__data_start) - ldi r27, hi8(__data_start) - ldi r30, lo8(__data_load_start) - ldi r31, hi8(__data_load_start) - - /* On the enhanced core, "elpm" with post-increment updates RAMPZ - automatically. Otherwise we have to handle it ourselves. */ - -#ifdef __AVR_ENHANCED__ - ldi r16, hh8(__data_load_start) -#else - ldi r16, hh8(__data_load_start - 0x10000) -.L__do_copy_data_carry: - inc r16 -#endif - out AVR_RAMPZ_ADDR, r16 - rjmp .L__do_copy_data_start -.L__do_copy_data_loop: -#ifdef __AVR_ENHANCED__ - elpm r0, Z+ -#else - elpm -#endif - st X+, r0 -#ifndef __AVR_ENHANCED__ - adiw r30, 1 - brcs .L__do_copy_data_carry -#endif -.L__do_copy_data_start: - cpi r26, lo8(__data_end) - cpc r27, r17 - brne .L__do_copy_data_loop -#ifdef __AVR_HAVE_RAMPD__ - out AVR_RAMPZ_ADDR, __zero_reg__ -#endif /* __AVR_HAVE_RAMPD__*/ - -#endif /* BIG_CODE */ - - .set __stack, RAMEND -#endif /* !__AVR_ASM_ONLY__ */ - - .section .init9,"ax",@progbits -#ifdef __AVR_ASM_ONLY__ - XJMP boot_card -#else /* !__AVR_ASM_ONLY__ */ - XCALL boot_card - XJMP exit -#endif /* __AVR_ASM_ONLY__ */ -; .endfunc - diff --git a/c/src/lib/libbsp/avr/avrtest/startup/linkcmds b/c/src/lib/libbsp/avr/avrtest/startup/linkcmds deleted file mode 100644 index 46548bffd3..0000000000 --- a/c/src/lib/libbsp/avr/avrtest/startup/linkcmds +++ /dev/null @@ -1,241 +0,0 @@ -/* - * Declare some sizes. - */ -RamBase = DEFINED(RamBase) ? RamBase : 0x08000000; -RamSize = DEFINED(RamSize) ? RamSize : 64K; -HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; -StackSize = DEFINED(StackSize) ? StackSize : 0x1000; - -/* Default linker script, for normal executables */ -OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr") -OUTPUT_ARCH(avr:5) -MEMORY -{ - text (rx) : ORIGIN = 0, LENGTH = 256K - data (rw!x) : ORIGIN = 0x800060, LENGTH = 0xffa0 - eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K -} -SECTIONS -{ - /* Read-only sections, merged into text segment: */ - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rel.init : { *(.rel.init) } - .rela.init : { *(.rela.init) } - .rel.text : - { - *(.rel.text) - *(.rel.text.*) - *(.rel.gnu.linkonce.t*) - } - .rela.text : - { - *(.rela.text) - *(.rela.text.*) - *(.rela.gnu.linkonce.t*) - } - .rel.fini : { *(.rel.fini) } - .rela.fini : { *(.rela.fini) } - .rel.rodata : - { - *(.rel.rodata) - *(.rel.rodata.*) - *(.rel.gnu.linkonce.r*) - } - .rela.rodata : - { - *(.rela.rodata) - *(.rela.rodata.*) - *(.rela.gnu.linkonce.r*) - } - .rel.data : - { - *(.rel.data) - *(.rel.data.*) - *(.rel.gnu.linkonce.d*) - } - .rela.data : - { - *(.rela.data) - *(.rela.data.*) - *(.rela.gnu.linkonce.d*) - } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.bss : { *(.rel.bss) } - .rela.bss : { *(.rela.bss) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - /* Internal text space or external memory */ - .text : - { - *(.vectors) - KEEP(*(.vectors)) - /* For data that needs to reside in the lower 64k of progmem. */ - *(.progmem.gcc*) - *(.progmem*) - . = ALIGN(2); - __trampolines_start = . ; - /* The jump trampolines for the 16-bit limited relocs will reside here. */ - *(.trampolines) - *(.trampolines*) - __trampolines_end = . ; - /* For future tablejump instruction arrays for 3 byte pc devices. - We don't relax jump/call instructions within these sections. */ - *(.jumptables) - *(.jumptables*) - /* For code that needs to reside in the lower 128k progmem. */ - *(.lowtext) - *(.lowtext*) - __ctors_start = . ; - *(.ctors) - __ctors_end = . ; - __dtors_start = . ; - *(.dtors) - __dtors_end = . ; - KEEP(SORT(*)(.ctors)) - KEEP(SORT(*)(.dtors)) - /* From this point on, we don't bother about wether the insns are - below or above the 16 bits boundary. */ - *(.init0) /* Start here after reset. */ - KEEP (*(.init0)) - *(.init1) - KEEP (*(.init1)) - *(.init2) /* Clear __zero_reg__, set up stack pointer. */ - KEEP (*(.init2)) - *(.init3) - KEEP (*(.init3)) - *(.init4) /* Initialize data and BSS. */ - KEEP (*(.init4)) - *(.init5) - KEEP (*(.init5)) - *(.init6) /* C++ constructors. */ - KEEP (*(.init6)) - *(.init7) - KEEP (*(.init7)) - *(.init8) - KEEP (*(.init8)) - *(.init9) /* Call main(). */ - KEEP (*(.init9)) - *(.text) - . = ALIGN(2); - *(.text.*) - . = ALIGN(2); - *(.fini9) /* _exit() starts here. */ - KEEP (*(.fini9)) - *(.fini8) - KEEP (*(.fini8)) - *(.fini7) - KEEP (*(.fini7)) - *(.fini6) /* C++ destructors. */ - KEEP (*(.fini6)) - *(.fini5) - KEEP (*(.fini5)) - *(.fini4) - KEEP (*(.fini4)) - *(.fini3) - KEEP (*(.fini3)) - *(.fini2) - KEEP (*(.fini2)) - *(.fini1) - KEEP (*(.fini1)) - *(.fini0) /* Infinite loop after program termination. */ - KEEP (*(.fini0)) - _etext = . ; - } > text - .tdata : AT (ADDR (.text) + SIZEOF (.text)) { - PROVIDE (__data_start = .) ; - _TLS_Data_begin = .; - *(.tdata .tdata.* .gnu.linkonce.td.*) - _TLS_Data_end = .; - } > data - .tbss : { - _TLS_BSS_begin = .; - *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) - _TLS_BSS_end = .; - } > data - _TLS_Data_size = _TLS_Data_end - _TLS_Data_begin; - _TLS_Data_begin = _TLS_Data_size != 0 ? _TLS_Data_begin : _TLS_BSS_begin; - _TLS_Data_end = _TLS_Data_size != 0 ? _TLS_Data_end : _TLS_BSS_begin; - _TLS_BSS_size = _TLS_BSS_end - _TLS_BSS_begin; - _TLS_Size = _TLS_BSS_end - _TLS_Data_begin; - _TLS_Alignment = MAX (ALIGNOF (.tdata), ALIGNOF (.tbss)); - .data : - { - *(.data) - *(.data*) - KEEP (*(SORT(.rtemsrwset.*))) - *(.rodata) /* We need to include .rodata here if gcc is used */ - *(.rodata*) /* with -fdata-sections. */ - KEEP (*(SORT(.rtemsroset.*))) - *(.gnu.linkonce.d*) - . = ALIGN(2); - _edata = . ; - PROVIDE (__data_end = .) ; - } > data - .bss SIZEOF(.data) + ADDR(.data) : - { - PROVIDE (__bss_start = .) ; - *(.bss) - *(.bss*) - *(COMMON) - PROVIDE (__bss_end = .) ; - . = ALIGN(16); - - . += StackSize; - PROVIDE (__stack = .); - PROVIDE (WorkAreaBase = .); - } > data - __data_load_start = LOADADDR(.data); - __data_load_end = __data_load_start + SIZEOF(.data); - /* Global data not cleared after reset. */ - .noinit SIZEOF(.bss) + ADDR(.bss) : - { - PROVIDE (__noinit_start = .) ; - *(.noinit*) - PROVIDE (__noinit_end = .) ; - _end = . ; - PROVIDE (__heap_start = .) ; - } > data - .eeprom : - { - *(.eeprom*) - __eeprom_end = . ; - } > eeprom - /* 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) *(.gnu.linkonce.wi.*) } - .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) } -} -- cgit v1.2.3