Changeset 331 for EcnlProtoTool/trunk/asp3_dcre/cfg

Timestamp:

Jan 21, 2018, 12:10:09 AM (6 years ago)

Author:

coas-nagasima

Message:

prototoolに関連するプロジェクトをnewlibからmuslを使うよう変更・更新
ntshellをnewlibの下位の実装から、muslのsyscallの実装に変更・更新
以下のOSSをアップデート
・mruby-1.3.0
・musl-1.1.18
・onigmo-6.1.3
・tcc-0.9.27
以下のOSSを追加
・openssl-1.1.0e
・curl-7.57.0
・zlib-1.2.11
以下のmrbgemsを追加
・iij/mruby-digest
・iij/mruby-env
・iij/mruby-errno
・iij/mruby-iijson
・iij/mruby-ipaddr
・iij/mruby-mock
・iij/mruby-require
・iij/mruby-tls-openssl

Location:

EcnlProtoTool/trunk/asp3_dcre/cfg

Files:

• cfg.rb (modified) (1 diff)
• pass1.rb (modified) (4 diffs)
• pass2.rb (modified) (2 diffs)

EcnlProtoTool/trunk/asp3_dcre/cfg/cfg.rb

@@ -532 +532 @@
 end
 
+def BZERO(address, size)
+  if !$romImage.nil?
+    $romImage.set_data(address, "00" * size)
+  end
+end
+
 def PEEK(address, size, signed=false)
   if !$romImage.nil?

EcnlProtoTool/trunk/asp3_dcre/cfg/pass1.rb

@@ -4 +4 @@
 #
 #  Copyright (C) 2015 by FUJI SOFT INCORPORATED, JAPAN
-#  Copyright (C) 2015,2016 by Embedded and Real-Time Systems Laboratory
+#  Copyright (C) 2015-2017 by Embedded and Real-Time Systems Laboratory
 #              Graduate School of Information Science, Nagoya Univ., JAPAN
 #
@@ -168 +168 @@
     end
 
-    symvalCsv = CSV.open(symvalTableFileName)
+    symvalCsv = CSV.open(symvalTableFileName,
+                                                { skip_blanks: true, skip_lines: /^#/ })
     symvalCsv.each do |record|
       # 変数名
       if record[0].nil?
-        error_exit("invalid variable name in `#{fileName}'")
+        error_exit("invalid variable name in " \
+                                                "`#{symvalTableFileName}:#{symvalCsv.to_io.lineno}'")
       end
 
@@ -235 +237 @@
     line = @cfgFile.gets
     return(nil) if line.nil?
+
+        line.encode!("UTF-16BE", "UTF-8",       # 不正なバイト列を除外する
+                                        :invalid => :replace,
+                                        :undef => :replace,
+                                        :replace => '?').encode!("UTF-8")
     @lineNo += 1
 
@@ -772 +779 @@
 
 #include "#{CFG1_OUT_TARGET_H}"
-#include <limits.h>
+
+#if defined(SIL_ENDIAN_BIG) && defined(SIL_ENDIAN_LITTLE)
+#error Both SIL_ENDIAN_BIG and SIL_ENDIAN_LITTLE are defined.
+#endif
+#if !defined(SIL_ENDIAN_BIG) && !defined(SIL_ENDIAN_LITTLE)
+#error Neither SIL_ENDIAN_BIG nor SIL_ENDIAN_LITTLE is defined.
+#endif
 
 const uint32_t #{CFG1_MAGIC_NUM} = 0x12345678;

EcnlProtoTool/trunk/asp3_dcre/cfg/pass2.rb

@@ -4 +4 @@
 #
 #  Copyright (C) 2015 by FUJI SOFT INCORPORATED, JAPAN
-#  Copyright (C) 2015,2016 by Embedded and Real-Time Systems Laboratory
+#  Copyright (C) 2015-2017 by Embedded and Real-Time Systems Laboratory
 #              Graduate School of Information Science, Nagoya Univ., JAPAN
 #
@@ -154 +154 @@
         value = @objidValues[paramName][param]
       else
+        apiDef = $apiDefinition[cfgInfo[:APINAME]]
         error("#{apiDef.has_key?(:KEYPAR) ? "E_NOEXS" : "E_ID"}: " \
                                         "`#{param}' in #{cfgInfo[:APINAME]} is not defined", \