Changeset 305 for asp3_wo_tecs/trunk/kernel/interrupt.trb
- Timestamp:
- Jun 26, 2017, 6:45:41 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
asp3_wo_tecs/trunk/kernel/interrupt.trb
r304 r305 53 53 # ã®è²¬ä»»ãè² ããªãï¼ 54 54 # 55 # $Id: interrupt.trb 572 2016-02-01 14:40:09Z ertl-hiro $55 # $Id: interrupt.trb 612 2016-02-08 04:27:57Z ertl-hiro $ 56 56 # 57 57 … … 65 65 $kernelCfgH.add("#define TNUM_ISRID\t#{$cfgData[:CRE_ISR].size}") 66 66 67 $cfgData[:CRE_ISR].sort.each do | id, params|67 $cfgData[:CRE_ISR].sort.each do |key, params| 68 68 $kernelCfgH.add("#define #{params[:isrid]}\t#{params[:isrid].val}") 69 69 end … … 127 127 # å²è¾¼ã¿è¦æ±ã©ã¤ã³ã«é¢ããã¨ã©ã¼ãã§ã㯠128 128 # 129 $cfgData[:CFG_INT].each do | id, params|129 $cfgData[:CFG_INT].each do |key, params| 130 130 # intnoãå²è¾¼ã¿çªå·ã¨ãã¦æ£ãããªãå ´åï¼E_PARï¼ï¼»NGKI2972ï¼½ 131 131 if $INTNO_VALID.index(params[:intno]).nil? … … 172 172 # å²è¾¼ã¿ãã³ãã©ã«é¢ããã¨ã©ã¼ãã§ã㯠173 173 # 174 $cfgData[:DEF_INH].each do | id, params|174 $cfgData[:DEF_INH].each do |key, params| 175 175 # inhnoãå²è¾¼ã¿ãã³ãã©çªå·ã¨ãã¦æ£ãããªãå ´åï¼E_PARï¼ï¼»NGKI3055ï¼½ 176 176 if $INHNO_VALID.index(params[:inhno]).nil? … … 243 243 # å²è¾¼ã¿ãµã¼ãã¹ã«ã¼ãã³ï¼ISRï¼ã«é¢ããã¨ã©ã¼ãã§ãã¯ã¨å²è¾¼ã¿ãã³ãã©ã®çæ 244 244 # 245 $cfgData[:CRE_ISR].sort.each do | id, params|245 $cfgData[:CRE_ISR].sort.each do |key, params| 246 246 # isratrãç¡å¹ã®å ´åï¼E_RSATRï¼ï¼»NGKI2998ï¼½ 247 247 #ï¼TARGET_ISRATR以å¤ã®ããããã»ããããã¦ããå ´åï¼ … … 264 264 265 265 $INTNO_CREISR_VALID.each do |intnoVal| 266 inhnoVal = $toInhnoVal[intnoVal]267 268 266 # å²è¾¼ã¿çªå·intnoã«å¯¾ãã¦ç»é²ãããISRã®ãªã¹ãã®ä½æ 269 267 isrParamsList = [] 270 $cfgData[:CRE_ISR].sort.each do | id, params|271 if params[:intno] == intnoVal268 $cfgData[:CRE_ISR].sort.each do |key, params| 269 if params[:intno].val == intnoVal 272 270 isrParamsList.push(params) 273 271 end … … 276 274 # å²è¾¼ã¿çªå·intnoã«å¯¾ãã¦ç»é²ãããISRãåå¨ããå ´å 277 275 if isrParamsList.size > 0 276 inhnoVal = $toInhnoVal[intnoVal] 277 278 278 # intnoã«å¯¾å¿ããinhnoã«å¯¾ãã¦DEF_INHãããå ´åï¼E_OBJï¼ï¼»NGKI3013ï¼½ 279 279 if $cfgData[:DEF_INH].has_key?(inhnoVal) … … 312 312 $cfgData[:DEF_INH][inhnoVal] = params 313 313 314 # ISRç¨ã®å²è¾¼ã¿ãã³ãã©314 # å²è¾¼ã¿ãµã¼ãã¹ã«ã¼ãã³ç¨ã®å²è¾¼ã¿ãã³ãã© 315 315 $kernelCfgC.add("void") 316 316 $kernelCfgC.add("_kernel_inthdr_#{intnoVal}(void)") 317 317 $kernelCfgC.add("{") 318 # ISRãåªå318 # å²è¾¼ã¿ãµã¼ãã¹ã«ã¼ãã³ãåªå 319 319 度é ã«å¼ã³åºã 320 isrParamsList.sort_by {|params| params[:isrpri]}.each_with_index \ 321 do |params, index| 320 i = 0 # stable sortãè¡ãããã®å¤æ° 321 isrParamsList.sort_by {|params| [ params[:isrpri].val, i += 1 ]} \ 322 .each_with_index do |params, index| 322 323 if index > 0 323 324 $kernelCfgC.add … … 353 354 # å²è¾¼ã¿ãã³ãã©ã®ã¨ã³ã㪠354 355 # 355 $cfgData[:DEF_INH].each do | id, params|356 $cfgData[:DEF_INH].each do |key, params| 356 357 if (params[:inhatr] & $TA_NONKERNEL) == 0 357 358 $kernelCfgC.add("INTHDR_ENTRY(#{params[:inhno]}, " \ … … 365 366 # 366 367 $kernelCfgC.add("const INHINIB _kernel_inhinib_table[TNUM_DEF_INHNO] = {") 367 $cfgData[:DEF_INH].each_with_index do |( id, params), index|368 $cfgData[:DEF_INH].each_with_index do |(key, params), index| 368 369 $kernelCfgC.add(",") if index > 0 369 370 if (params[:inhatr] & $TA_NONKERNEL) == 0 … … 402 403 if $cfgData[:CFG_INT].size != 0 403 404 $kernelCfgC.add("const INTINIB _kernel_intinib_table[TNUM_CFG_INTNO] = {") 404 $cfgData[:CFG_INT].each_with_index do |( id, params), index|405 $cfgData[:CFG_INT].each_with_index do |(key, params), index| 405 406 $kernelCfgC.add(",") if index > 0 406 407 $kernelCfgC.append("\t{ (#{params[:intno]}), (#{params[:intatr]}), " \
Note:
See TracChangeset
for help on using the changeset viewer.