Changeset 414 for ssp_armv6_m_gcc/branches/rubycfg/armv6_m_gcc

Timestamp:

Mar 12, 2020, 4:49:45 PM (4 years ago)

Author:

nmir-saito

Message:

support ruby configurator(file's charactor code is converted to UTF-8)

Location:

ssp_armv6_m_gcc/branches/rubycfg/armv6_m_gcc

Files:

• MANIFEST (modified) (1 prop)
• Makefile.prc (modified) (3 diffs, 1 prop)
• arm_m.h (modified) (1 prop)
• prc.tf (modified) (1 prop)
• prc_cfg1_out.h (modified) (1 prop)
• prc_check.tf (modified) (1 prop)
• prc_check.trb (copied) (copied from rubycfg_ssp/trunk/prc_check.trb )
• prc_config.c (modified) (1 prop)
• prc_config.h (modified) (1 prop)
• prc_def.csv (deleted)
• prc_insn.h (modified) (1 prop)
• prc_kernel.h (modified) (1 prop)
• prc_kernel.trb (copied) (copied from rubycfg_ssp/trunk/prc_kernel.trb ) (5 diffs)
• prc_rename.def (modified) (1 prop)
• prc_rename.h (modified) (1 prop)
• prc_sil.h (modified) (1 prop)
• prc_stddef.h (modified) (1 prop)
• prc_support.S (modified) (1 prop)
• prc_sym.def (copied) (copied from rubycfg_ssp/trunk/prc_sym.def )
• prc_test.h (modified) (1 prop)
• prc_timer.c (modified) (1 prop)
• prc_timer.cfg (modified) (1 prop)
• prc_timer.h (modified) (1 prop)
• prc_unrename.h (modified) (1 prop)
• prc_user.txt (modified) (1 prop)
• start.S (modified) (1 prop)

ssp_armv6_m_gcc/branches/rubycfg/armv6_m_gcc/Makefile.prc

@@ -1 +1 @@
 #
 #  @(#) $Id: Makefile.prc 1304 2008-08-27 07:28:36Z ertl-honda $
-# 
+#
 
 #
@@ -7 +7 @@
 #
 
+PRCDIR = $(SRCDIR)/arch/$(PRC)_$(TOOL)
+
 #
 #  コンパイルオプション
 #
-INCLUDES := $(INCLUDES) -I$(SRCDIR)/arch/$(PRC)_$(TOOL)/
-LDFLAGS := -nostdlib $(LDFLAGS) 
+COPTS := $(COPTS)
 CDEFS := $(CDEFS) -DTOPPERS_LABEL_ASM
+INCLUDES := $(INCLUDES) -I$(PRCDIR)
+LDFLAGS := -nostdlib $(LDFLAGS)
 LIBS := $(LIBS)  -lgcc
 
@@ -18 +21 @@
 #  カーネルに関する定義
 #
-KERNEL_DIR := $(KERNEL_DIR) $(SRCDIR)/arch/$(PRC)_$(TOOL)
+KERNEL_DIRS := $(KERNEL_DIRS) $(PRCDIR)
 KERNEL_ASMOBJS := $(KERNEL_ASMOBJS) prc_support.o
 KERNEL_COBJS := $(KERNEL_COBJS) prc_config.o prc_timer.o
+KERNEL_CFLAGS := $(KERNEL_CFLAGS)
 
 #
 #  コンフィギュレータ関係の変数の定義
 #
-CFG_TABS := $(CFG_TABS) --cfg1-def-table $(SRCDIR)/arch/$(PRC)_$(TOOL)/prc_def.csv
+CFG_TABS := $(CFG_TABS) --symval-table $(PRCDIR)/prc_sym.def
+CFG1_OUT_LDFLAGS := $(CFG1_OUT_LDFLAGS)
+CFG_OBJS := $(CFG_OBJS)
+CFG2_OUT := $(CFG2_OUT)
 
 #
 #  依存関係の定義
 #
-cfg1_out.c: $(SRCDIR)/arch/$(PRC)_$(TOOL)/prc_def.csv
-kernel_cfg.timestamp: $(SRCDIR)/arch/$(PRC)_$(TOOL)/prc.tf
+cfg1_out.c: $(PRCDIR)/prc_sym.def
+kernel_cfg.timestamp: $(PRCDIR)/prc_kernel.trb
+check.timestamp: $(PRCDIR)/prc_check.trb
+
+#
+#  その他
+#
+CLEAN_FILES := $(CLEAN_FILES)
+REALCLEAN_FILES := $(REALCLEAN_FILES)

ssp_armv6_m_gcc/branches/rubycfg/armv6_m_gcc/prc_kernel.trb

@@ -8 +8 @@
 #   Copyright (C) 2015,2016 by Embedded and Real-Time Systems Laboratory
 #               Graduate School of Information Science, Nagoya Univ., JAPAN
-#   Copyright (C) 2017 by Naoki Saito
+#   Copyright (C) 2017-2020 by Naoki Saito
 #              Nagoya Municipal Industrial Research Institute, JAPAN
 #
@@ -45 +45 @@
 
 #
-#               パス2の生成スクリプトのコア依存部（ARM用）
+#               パス2の生成スクリプトのコア依存部（ARMv6-M用）
 #
 
@@ -57 +57 @@
 #  有効なCPU例外ハンドラ番号
 #
-$EXCNO_VALID = [ 2, 3, 4, 5, 6, 11, 12, 14 ]
+$EXCNO_VALID = [ 2, 3, 11, 14 ]
 
 #
@@ -92 +92 @@
 IncludeTrb("kernel/kernel.trb")
 
-$kernelCfgC.comment_header("Target-dependent Definitions (ARM-M)")
+$kernelCfgC.comment_header("Target-dependent Definitions (ARMv6-M)")
 
 #
@@ -107 +107 @@
 
 (2..14).each do |excno|
-  if excno == 11
-    $kernelCfgC.append("\t(FP)(kernel_svc_handler),      // 11 SVCall handler")
-  else
-    $kernelCfgC.append("\t(FP)(_kernel_exc_entry),")
-  end
+  $kernelCfgC.append("\t(FP)(_kernel_exc_entry),")
   $kernelCfgC.add(" /* #{excno} */")
 end