add libhal tests, some cleanup (some mess-making)

2 files changed, 215 insertions, 6 deletions

diff --git a/libc/printf.c b/libc/printf.c
index 78f210a..695fcd7 100644
--- a/libc/printf.c
+++ b/libc/printf.c
@@ -47,6 +47,7 @@ mod:	N	near ptr				DONE
 *****************************************************************************/

 #include <string.h> /* strlen() */

 #include <stdio.h> /* stdout, putchar(), fputs() (but not printf() :) */

+#undef putchar

 

 #if 1

 #include <stdarg.h> /* va_list, va_start(), va_arg(), va_end() */

@@ -93,15 +94,9 @@ typedef void *va_list;
 #define	PR_WS	0x20	/* PR_SG set and num was < 0 */

 #define	PR_LZ	0x40	/* pad left with '0' instead of ' ' */

 #define	PR_FP	0x80	/* pointers are far */

-#if 0

-/* largest number handled is 2^32-1, lowest radix handled is 8.

-2^32-1 in base 8 has 11 digits (add 5 for trailing NUL and for slop) */

-#define	PR_BUFLEN	16

-#else

 /* largest number handled is 2^64-1, lowest radix handled is 8.

 2^64-1 in base 8 has 22 digits (add 2 for trailing NUL and for slop) */

 #define	PR_BUFLEN	24

-#endif

 

 typedef int (*fnptr_t)(unsigned c, void **helper);

 /*****************************************************************************

@@ -410,3 +405,22 @@ int main(void)
 	return 0;

 }

 #endif

+

+/*****************************************************************************

+2015-10-29 pselkirk for cryptech

+*****************************************************************************/

+/* gcc decides that a plain string with no formatting is best handled by puts() */

+int puts(const char *s)

+{

+    return printf("%s\n", s);

+}

+

+/* transmit characters to the uart */

+#include "stm-uart.h"

+int putchar(int c)

+{

+    if (c == '\n')

+	uart_send_char('\r');

+    uart_send_char((uint8_t) c);

+    return c;

+}

diff --git a/libc/syscalls.c b/libc/syscalls.c
new file mode 100644
index 0000000..9212763
--- /dev/null
+++ b/libc/syscalls.c
@@ -0,0 +1,195 @@
+/****************************************************************************
+*  Copyright (c) 2009 by Michael Fischer. All rights reserved.
+*
+*  Redistribution and use in source and binary forms, with or without 
+*  modification, are permitted provided that the following conditions 
+*  are met:
+*  
+*  1. Redistributions of source code must retain the above copyright 
+*     notice, this list of conditions and the following disclaimer.
+*  2. 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.
+*  3. Neither the name of the author nor the names of its 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.
+*
+****************************************************************************
+*  History:
+*
+*  28.03.09  mifi   First Version, based on the original syscall.c from
+*                   newlib version 1.17.0
+****************************************************************************/
+
+/* 2015-10-29 pselkirk for cryptech:
+ * Changed asm to __asm for c99 compatibility.
+ * Added _exit, _kill, and _getpid from mifi's 2013 revision.
+ */
+
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+/***************************************************************************/
+
+int _read_r (struct _reent *r, int file, char * ptr, int len)
+{
+  r = r;
+  file = file;
+  ptr = ptr;
+  len = len;
+  
+  errno = EINVAL;
+  return -1;
+}
+
+/***************************************************************************/
+
+int _lseek_r (struct _reent *r, int file, int ptr, int dir)
+{
+  r = r;
+  file = file;
+  ptr = ptr;
+  dir = dir;
+  
+  return 0;
+}
+
+/***************************************************************************/
+
+int _write_r (struct _reent *r, int file, char * ptr, int len)
+{  
+  r = r;
+  file = file;
+  ptr = ptr;
+
+#if 0
+  int index;
+  
+  /* For example, output string by UART */
+  for(index=0; index<len; index++)
+  {
+    if (ptr[index] == '\n')
+    {
+      uart_putc('\r');
+    }  
+
+    uart_putc(ptr[index]);
+  }  
+#endif   
+  
+  return len;
+}
+
+/***************************************************************************/
+
+int _close_r (struct _reent *r, int file)
+{
+  return 0;
+}
+
+/***************************************************************************/
+
+/* Register name faking - works in collusion with the linker.  */
+register char * stack_ptr __asm ("sp");
+
+caddr_t _sbrk_r (struct _reent *r, int incr)
+{
+  extern char   end __asm ("end"); /* Defined by the linker.  */
+  static char * heap_end;
+  char *        prev_heap_end;
+
+  if (heap_end == NULL)
+    heap_end = & end;
+  
+  prev_heap_end = heap_end;
+  
+  if (heap_end + incr > stack_ptr)
+  {
+      /* Some of the libstdc++-v3 tests rely upon detecting
+        out of memory errors, so do not abort here.  */
+#if 0
+      extern void abort (void);
+
+      _write (1, "_sbrk: Heap and stack collision\n", 32);
+      
+      abort ();
+#else
+      errno = ENOMEM;
+      return (caddr_t) -1;
+#endif
+  }
+  
+  heap_end += incr;
+
+  return (caddr_t) prev_heap_end;
+}
+
+/***************************************************************************/
+
+int _fstat_r (struct _reent *r, int file, struct stat * st)
+{
+  r = r; 
+  file = file;
+   
+  memset (st, 0, sizeof (* st));
+  st->st_mode = S_IFCHR;
+  return 0;
+}
+
+/***************************************************************************/
+
+int _isatty_r(struct _reent *r, int fd)
+{
+  r = r;
+  fd = fd;
+   
+  return 1;
+}
+
+/***************************************************************************/
+
+void _exit (int a)
+{
+  a = a;
+  
+  while(1) {};
+}
+
+/***************************************************************************/
+
+int _kill (int a, int b)
+{
+  a = a;
+  b = b;
+  
+  return 0;
+}
+
+/***************************************************************************/
+
+int _getpid(int a)
+{
+  a = a;
+  
+  return 0;
+}
+
+/*** EOF ***/
+
+