Changeset 306 for asp3_wo_tecs/trunk/kernel/kernel.trb
- Timestamp:
- Jun 27, 2017, 10:53:32 AM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
asp3_wo_tecs/trunk/kernel/kernel.trb
r305 r306 45 45 # å 46 46 責ãããã¨ï¼ 47 # 47 # 48 48 # æ¬ã½ããã¦ã§ã¢ã¯ï¼ç¡ä¿è¨¼ã§æä¾ããã¦ãããã®ã§ããï¼ä¸è¨èä½æ¨©è 49 49 ã … … 52 52 # ã¢ã®å©ç¨ã«ããç´æ¥çã¾ãã¯éæ¥çã«çãããããªãæ害ã«é¢ãã¦ãï¼ã 53 53 # ã®è²¬ä»»ãè² ããªãï¼ 54 # 55 # $Id: kernel.trb 588 2016-02-05 12:54:58Z ertl-hiro $56 # 54 # 55 # $Id: kernel.trb 670 2016-03-03 15:08:11Z ertl-hiro $ 56 # 57 57 58 58 # … … 60 60 # 61 61 62 # 62 # 63 63 # ã¿ã¤ã ã¹ã¿ã³ããã¡ã¤ã«ã®æå® 64 # 64 # 65 65 $timeStampFileName = "kernel_cfg.timestamp" 66 66 … … 70 70 # 71 71 $kernelCfgH = GenFile.new("kernel_cfg.h") 72 $kernelCfgH.a ppend(<<EOS)72 $kernelCfgH.add(<<EOS) 73 73 /* kernel_cfg.h */ 74 74 #ifndef TOPPERS_KERNEL_CFG_H 75 75 #define TOPPERS_KERNEL_CFG_H 76 77 76 EOS 78 77 … … 82 81 # 83 82 $kernelCfgC = GenFile.new("kernel_cfg.c") 84 $kernelCfgC.a ppend(<<EOS)83 $kernelCfgC.add(<<EOS) 85 84 /* kernel_cfg.c */ 86 85 #include "kernel/kernel_int.h" … … 90 89 #error The kernel does not match this configuration file. 91 90 #endif 92 93 EOS 94 95 # 91 EOS 92 93 # 96 94 # ã¤ã³ã¯ã«ã¼ããã£ã¬ã¯ãã£ãï¼#includeï¼ 97 # 95 # 98 96 $kernelCfgC.comment_header("Include Directives") 99 97 $includeFiles.each do |file| … … 142 140 143 141 # ãªãã¸ã§ã¯ãã®IDçªå·ãä¿æããå¤æ° 144 if !$USE_EXTERNAL_ID.nil?142 if $USE_EXTERNAL_ID 145 143 $cfgData[@api].sort.each do |key, params| 146 144 $kernelCfgC.add("const ID #{params[@objid]}_id" \ … … 224 222 || (nfymode2 == $TENFY_SETFLG && epar2.nil?) 225 223 # ãã©ã¡ã¼ã¿ã足ããªãå ´å 226 error_api(params, "too few parameters for nfymode `#{nfymode}' " \227 " in #{params[:apiname]} of #{params[objid]}")224 error_api(params, "too few parameters for nfymode `#{nfymode}' " \ 225 "in %apiname of %#{objid}") 228 226 elsif (nfymode2 == 0 && !epar1.nil?) \ 229 227 || (nfymode2 != $TENFY_SETFLG && !epar2.nil?) 230 228 # ãã©ã¡ã¼ã¿ãå¤ãããå ´å 231 error_api(params, "too many parameters for nfymode `#{nfymode}' " \232 " in #{params[:apiname]} of #{params[objid]}")229 error_api(params, "too many parameters for nfymode `#{nfymode}' " \ 230 "in %apiname of %#{objid}") 233 231 elsif nfymode == $TNFY_HANDLER 234 232 # ã¿ã¤ã ã¤ãã³ããã³ãã©ã®å¼åºã … … 354 352 IncludeTrb("kernel/exception.trb") 355 353 356 # 354 # 357 355 # éã¿ã¹ã¯ã³ã³ããã¹ãç¨ã®ã¹ã¿ãã¯é å 358 # 356 # 359 357 $kernelCfgC.comment_header("Stack Area for Non-task Context") 360 358 361 if $cfgData[:DEF_ICS].size ()== 0359 if $cfgData[:DEF_ICS].size == 0 362 360 # DEF_ICSããªãå ´åã®ããã©ã«ãå¤ã®è¨å® 363 361 if $DEFAULT_ISTK.nil? … … 371 369 else 372 370 # éçAPIãDEF_ICSããè¤æ°ããï¼E_OBJï¼ï¼»NGKI3216ï¼½ 373 if $cfgData[:DEF_ICS].size ()> 1371 if $cfgData[:DEF_ICS].size > 1 374 372 error("E_OBJ: too many DEF_ICS") 375 373 end … … 378 376 params = $cfgData[:DEF_ICS][1] 379 377 378 # ãã©ã¡ã¼ã¿ãçç¥ãããæã®ããã©ã«ãå¤ã®è¨å® 379 params[:istk] ||= "NULL" 380 380 381 # istkszãã¿ã¼ã²ããå®ç¾©ã®æå°å¤ï¼TARGET_MIN_ISTKSZï¼æªå®ç¾©ã®å ´åã¯1ï¼ 381 382 # ãããå°ããå ´åï¼E_PARï¼ï¼»NGKI3254ï¼½ 382 if params[:istksz] < =$TARGET_MIN_ISTKSZ383 if params[:istksz] < $TARGET_MIN_ISTKSZ 383 384 error_wrong("E_PAR", params, :istksz, "too small") 384 385 end 385 386 386 if (params[:istk] == "NULL")387 if params[:istk] == "NULL" 387 388 # ã¹ã¿ãã¯é åã®èªåå²ä»ã 388 389 istksz = AllocStack("_kernel_istack", params[:istksz]) 389 390 istk = "_kernel_istack" 390 391 else … … 399 400 end 400 401 401 $kernelCfgC.a ppend(<<EOS)402 $kernelCfgC.add(<<EOS) 402 403 const size_t _kernel_istksz = #{istksz}; 403 404 STK_T *const _kernel_istk = #{istk}; … … 406 407 STK_T *const _kernel_istkpt = TOPPERS_ISTKPT(#{istk}, #{istksz}); 407 408 #endif /* TOPPERS_ISTKPT */ 408 409 EOS 410 411 # 409 EOS 410 411 # 412 412 # ã¿ã¤ã ã¤ãã³ã管ç 413 # 413 # 414 414 $kernelCfgC.comment_header("Time Event Management") 415 $kernelCfgC.a ppend(<<EOS)415 $kernelCfgC.add(<<EOS) 416 416 TMEVTN _kernel_tmevt_heap[1 + TNUM_TSKID + TNUM_CYCID + TNUM_ALMID]; 417 418 EOS 419 420 # 417 EOS 418 419 # 421 420 # åã¢ã¸ã¥ã¼ã«ã®åæåé¢æ° 422 # 421 # 423 422 $kernelCfgC.comment_header("Module Initialization Function") 424 423 $kernelCfgC.append(<<EOS) … … 428 427 EOS 429 428 $initializeFunctions.each do |func| 430 429 $kernelCfgC.add("\t#{func}") 431 430 end 432 431 $kernelCfgC.add2("}") 433 432 434 # 433 # 435 434 # åæåã«ã¼ãã³æ©è½ 436 # 437 # 435 # 438 436 $kernelCfgC.comment_header("Initialization Routine") 439 437 … … 442 440 # iniatrãç¡å¹ã®å ´åï¼E_RSATRï¼ï¼»NGKI3241ï¼½ 443 441 #ï¼TA_NULLã§ãªãå ´åï¼ 444 if (params[:iniatr] != 0)442 if (params[:iniatr] != $TA_NULL) 445 443 error_illegal_sym("E_RSATR", params, :iniatr, :inirtn) 446 444 end … … 459 457 $kernelCfgC.add2("}") 460 458 461 # 459 # 462 460 # çµäºå¦çã«ã¼ãã³æ©è½ 463 # 461 # 464 462 $kernelCfgC.comment_header("Termination Routine") 465 463 … … 468 466 # teratrãç¡å¹ã®å ´åï¼E_RSATRï¼ï¼»NGKI3248ï¼½ 469 467 #ï¼TA_NULLã§ãªãå ´åï¼ 470 if (params[:teratr] != 0)468 if (params[:teratr] != $TA_NULL) 471 469 error_illegal_sym("E_RSATR", params, :teratr, :terrtn) 472 470 end
Note:
See TracChangeset
for help on using the changeset viewer.