Changeset 429 for EcnlProtoTool/trunk/asp3_dcre/include/t_stddef.h

Timestamp:

Jul 3, 2020, 7:19:17 PM (4 years ago)

Author:

coas-nagasima

Message:

ASP3, TINET, mbed を更新

File:

• EcnlProtoTool/trunk/asp3_dcre/include/t_stddef.h (modified) (3 diffs)

EcnlProtoTool/trunk/asp3_dcre/include/t_stddef.h

@@ -5 +5 @@
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2004-2015 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2004-2019 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -113 +113 @@
 #endif /* UINT64_MAX */
 typedef uint32_t                PRCTIM;         /* プロセッサ時間［NGKI0573］*/
+#ifndef USE_64BIT_HRTCNT
 typedef uint32_t                HRTCNT;         /* 高分解能タイマのカウント値 */
+#else /* USE_64BIT_HRTCNT */
+#ifndef UINT64_MAX
+#error 64bit data types are required when USE_64BIT_HRTCNT.
+#endif
+typedef uint64_t                HRTCNT;         /* 高分解能タイマのカウント値 */
+#endif /* USE_64BIT_HRTCNT */
 
 typedef TOPPERS_fp              FP;                     /* プログラムの起動番地 */
@@ -214 +221 @@
  */
 #ifndef offsetof
-#define offsetof(structure, field)      ((uintptr_t) &(((structure *) 0)->field))
+#define offsetof(structure, field) \
+                ((uintptr_t)(((char *) &(((structure *) 0)->field)) - ((char *) 0)))
 #endif /* offsetof */