Changeset 442 for EcnlProtoTool/trunk/asp3_dcre/mbed/mbed_stub.c

Timestamp:

Jul 13, 2020, 8:07:55 PM (4 years ago)

Author:

coas-nagasima

Message:

ntshellアプリはnewlibを使うよう変更し、syscallの実装部分と区別がつくよう更新。

File:

• EcnlProtoTool/trunk/asp3_dcre/mbed/mbed_stub.c (modified) (2 diffs)

EcnlProtoTool/trunk/asp3_dcre/mbed/mbed_stub.c

@@ -46 +46 @@
 #include <sil.h>
 #include "us_ticker_api.h"
-#include <sys/types.h>
-#include <errno.h>
+#include "mbed_retarget.h"
 #include "kernel_cfg.h"
 #include "t_syslog.h"
@@ -80 +79 @@
         sta_ker();
 }
+
+void _exit(int status)
+{
+        ext_ker();
+}
+
+int malloc_lock_sem_count[TNUM_TSKID];
+
+void __malloc_lock(void * reent)
+{
+        ER ercd;
+        ID tskid = 0;
+
+        ercd = get_tid(&tskid);
+        if (ercd != E_OK) {
+                goto error;
+        }
+
+        if (malloc_lock_sem_count[tskid - 1] == 0) {
+                ercd = wai_sem(SEM_MALLOC);
+                if (ercd != E_OK) {
+                        goto error;
+                }
+        }
+
+        malloc_lock_sem_count[tskid - 1]++;
+        return;
+error:
+        syslog(LOG_ERROR, "%s (%d) __malloc_lock error.",
+                itron_strerror(ercd), SERCD(ercd));
+        DebugBreak();
+}
+
+void __malloc_unlock(void * reent)
+{
+        ER ercd;
+        ID tskid = 0;
+        int count;
+
+        ercd = get_tid(&tskid);
+        if (ercd != E_OK) {
+                goto error;
+        }
+
+        malloc_lock_sem_count[tskid - 1]--;
+        if (malloc_lock_sem_count[tskid - 1] > 0)
+                return;
+
+        if (malloc_lock_sem_count[tskid - 1] < 0) {
+                goto error;
+        }
+
+        ercd = sig_sem(SEM_MALLOC);
+        if (ercd != E_OK) {
+                goto error;
+        }
+        return;
+error:
+        syslog(LOG_ERROR, "%s (%d) __malloc_unlock error.",
+                itron_strerror(ercd), SERCD(ercd));
+        DebugBreak();
+}
+
+extern uint32_t __HeapBase;
+extern uint32_t __HeapLimit;
+extern uint32_t __end__;
+
+void *_sbrk(int incr)
+{ 
+    static unsigned char *heap = (unsigned char *)&__end__;
+    unsigned char        *prev_heap = heap;
+    unsigned char        *new_heap = heap + incr;
+
+    if (new_heap >= (unsigned char *)&__HeapLimit) {
+        errno = ENOMEM;
+        return (void *) -1;
+    }
+
+    heap = new_heap;
+    return (void *) prev_heap;
+}