From c8e0bc1bd09a637cb9e7d64eb39f2513bb5a86e9 Mon Sep 17 00:00:00 2001 From: bje Date: Thu, 28 Jun 2001 07:51:59 +0000 Subject: [PATCH] 2001-06-28 Ben Elliston * sidcomp.cfgroot/setInvAtt.badconf: Remove ARM-specific parts. * sidcomp.cfgroot/setInvAttV.badconf: Likewise. * sidcomp.cfgroot/setInvComp.badconf: Likewise. * sidcomp.cfgroot/wrongOrd3.badconf: Likewise. * sidcomp.cfgroot/setInvAtt.expect: Update to reflect new errors. * sidcomp.cfgroot/setInvAttV.expect: Likewise. * sidcomp.cfgroot/setInvComp.expect: Likewise. * sidcomp.cfgroot/wrongOrd3.expect: Likewise. --- sid/component/testsuite/ChangeLog | 11 +++++++++++ .../testsuite/sidcomp.cfgroot/setInvAtt.badconf | 16 ---------------- .../testsuite/sidcomp.cfgroot/setInvAtt.expect | 22 +++++++++------------- .../testsuite/sidcomp.cfgroot/setInvAttV.badconf | 13 ------------- .../testsuite/sidcomp.cfgroot/setInvAttV.expect | 9 ++++----- .../testsuite/sidcomp.cfgroot/setInvComp.badconf | 11 ----------- .../testsuite/sidcomp.cfgroot/setInvComp.expect | 14 +++++++------- .../testsuite/sidcomp.cfgroot/wrongOrd3.badconf | 18 ++++-------------- .../testsuite/sidcomp.cfgroot/wrongOrd3.expect | 18 +++++++++--------- 9 files changed, 44 insertions(+), 88 deletions(-) diff --git a/sid/component/testsuite/ChangeLog b/sid/component/testsuite/ChangeLog index 7c2c8d00e7..8b57ac28bb 100644 --- a/sid/component/testsuite/ChangeLog +++ b/sid/component/testsuite/ChangeLog @@ -1,3 +1,14 @@ +2001-06-28 Ben Elliston + + * sidcomp.cfgroot/setInvAtt.badconf: Remove ARM-specific parts. + * sidcomp.cfgroot/setInvAttV.badconf: Likewise. + * sidcomp.cfgroot/setInvComp.badconf: Likewise. + * sidcomp.cfgroot/wrongOrd3.badconf: Likewise. + * sidcomp.cfgroot/setInvAtt.expect: Update to reflect new errors. + * sidcomp.cfgroot/setInvAttV.expect: Likewise. + * sidcomp.cfgroot/setInvComp.expect: Likewise. + * sidcomp.cfgroot/wrongOrd3.expect: Likewise. + 2001-06-23 Frank Ch. Eigler * config/default.exp: New file, moved from ../../config/unix.exp. diff --git a/sid/component/testsuite/sidcomp.cfgroot/setInvAtt.badconf b/sid/component/testsuite/sidcomp.cfgroot/setInvAtt.badconf index dd54cb1dd0..193d229ef8 100644 --- a/sid/component/testsuite/sidcomp.cfgroot/setInvAtt.badconf +++ b/sid/component/testsuite/sidcomp.cfgroot/setInvAtt.badconf @@ -4,31 +4,20 @@ set main "verbose?" 0 # should be verbose # component libraries -load libcgencpu.la cgen_component_library load libconsoles.la console_component_library -load libgloss.la gloss_component_library -load libinterrupt.la interrupt_component_library load libloader.la loader_component_library load libmapper.la mapper_component_library load libmemory.la mem_component_library -load libmmu.la mmu_component_library load libsched.la sched_component_library -load libtimers.la timer_component_library # Components -new hw-cpu-arm7t cpu new sw-load-elf loader new sid-io-stdio stdio -new sw-gloss-arm/angel angel -new hw-interrupt-arm/ref intctrl new hw-mapper-basic bus -new hw-remap/pause-arm/ref remapper new sid-sched-host host-sched new sid-sched-sim target-sched new hw-memory-ram/rom-basic mem -new hw-timer-arm/ref-sched timer1 -new hw-timer-arm/ref-sched timer2 # Scheduler @@ -42,13 +31,8 @@ set host-sched host-sched 50 # host-sched does not have attrib host-sched # Alter this attribute to get more available system RAM. set mem ramsize 8388608 # should be size -set cpu size 1 # cpu does not have attrib size set loader size 8388608 # loader does not have attrib size # Attributes set loader file hello # should be files set loader ver 0 # should be verbose -set angel timer1 0 # angel does not have attrib timer1 -set cpu _engine-type_ scache # should be engine-type -set cpu step-count 1000 # should be step-insn-count - diff --git a/sid/component/testsuite/sidcomp.cfgroot/setInvAtt.expect b/sid/component/testsuite/sidcomp.cfgroot/setInvAtt.expect index 24012be24a..6a0eb9dc03 100644 --- a/sid/component/testsuite/sidcomp.cfgroot/setInvAtt.expect +++ b/sid/component/testsuite/sidcomp.cfgroot/setInvAtt.expect @@ -1,14 +1,10 @@ -setInvAtt.badconf:35: component target-sched attribute enabled not found -setInvAtt.badconf:36: component target-sched attribute number-of-clients not found -setInvAtt.badconf:38: component host-sched attribute disabled? not found -setInvAtt.badconf:39: component host-sched attribute num-clientss not found -setInvAtt.badconf:40: component host-sched attribute sim? not found -setInvAtt.badconf:41: component host-sched attribute host-sched not found -setInvAtt.badconf:44: component mem attribute ramsize not found -setInvAtt.badconf:45: component cpu attribute size not found -setInvAtt.badconf:46: component loader attribute size not found -setInvAtt.badconf:50: component loader attribute ver not found -setInvAtt.badconf:51: component angel attribute timer1 not found -setInvAtt.badconf:52: component cpu attribute _engine-type_ not found -setInvAtt.badconf:53: component cpu attribute step-count not found +setInvAtt.badconf:24: component target-sched attribute enabled not found +setInvAtt.badconf:25: component target-sched attribute number-of-clients not found +setInvAtt.badconf:27: component host-sched attribute disabled? not found +setInvAtt.badconf:28: component host-sched attribute num-clientss not found +setInvAtt.badconf:29: component host-sched attribute sim? not found +setInvAtt.badconf:30: component host-sched attribute host-sched not found +setInvAtt.badconf:33: component mem attribute ramsize not found +setInvAtt.badconf:34: component loader attribute size not found +setInvAtt.badconf:38: component loader attribute ver not found Configuration error. Aborting. diff --git a/sid/component/testsuite/sidcomp.cfgroot/setInvAttV.badconf b/sid/component/testsuite/sidcomp.cfgroot/setInvAttV.badconf index 2a52e9192b..c890c928ce 100644 --- a/sid/component/testsuite/sidcomp.cfgroot/setInvAttV.badconf +++ b/sid/component/testsuite/sidcomp.cfgroot/setInvAttV.badconf @@ -4,31 +4,20 @@ set main verbose? anything # should be 0 # component libraries -load libcgencpu.la cgen_component_library load libconsoles.la console_component_library -load libgloss.la gloss_component_library -load libinterrupt.la interrupt_component_library load libloader.la loader_component_library load libmapper.la mapper_component_library load libmemory.la mem_component_library -load libmmu.la mmu_component_library load libsched.la sched_component_library -load libtimers.la timer_component_library # Components -new hw-cpu-arm7t cpu new sw-load-elf loader new sid-io-stdio stdio -new sw-gloss-arm/angel angel -new hw-interrupt-arm/ref intctrl new hw-mapper-basic bus -new hw-remap/pause-arm/ref remapper new sid-sched-host host-sched new sid-sched-sim target-sched new hw-memory-ram/rom-basic mem -new hw-timer-arm/ref-sched timer1 -new hw-timer-arm/ref-sched timer2 # Scheduler @@ -46,5 +35,3 @@ set mem size ~!@#$%^& # Attributes set loader file hello -set cpu engine-type 0 # should be scache -set cpu step-insn-count 1000 diff --git a/sid/component/testsuite/sidcomp.cfgroot/setInvAttV.expect b/sid/component/testsuite/sidcomp.cfgroot/setInvAttV.expect index 44f6d514d4..aa761c8c73 100644 --- a/sid/component/testsuite/sidcomp.cfgroot/setInvAttV.expect +++ b/sid/component/testsuite/sidcomp.cfgroot/setInvAttV.expect @@ -1,7 +1,6 @@ setInvAttV.badconf:4: component main attribute verbose? bad value anything -setInvAttV.badconf:35: component target-sched attribute enabled? bad value -234 -setInvAttV.badconf:41: component host-sched attribute 0-regular? not found -setInvAttV.badconf:42: component host-sched attribute 0-time not found -setInvAttV.badconf:45: component mem attribute size bad value ~!@#$%^& -setInvAttV.badconf:49: component cpu attribute engine-type bad value 0 +setInvAttV.badconf:24: component target-sched attribute enabled? bad value -234 +setInvAttV.badconf:30: component host-sched attribute 0-regular? not found +setInvAttV.badconf:31: component host-sched attribute 0-time not found +setInvAttV.badconf:34: component mem attribute size bad value ~!@#$%^& Configuration error. Aborting. diff --git a/sid/component/testsuite/sidcomp.cfgroot/setInvComp.badconf b/sid/component/testsuite/sidcomp.cfgroot/setInvComp.badconf index 8a8035aeb0..503ea3d454 100644 --- a/sid/component/testsuite/sidcomp.cfgroot/setInvComp.badconf +++ b/sid/component/testsuite/sidcomp.cfgroot/setInvComp.badconf @@ -4,31 +4,20 @@ set main verbose? 0 # component libraries -load libcgencpu.la cgen_component_library load libconsoles.la console_component_library -load libgloss.la gloss_component_library -load libinterrupt.la interrupt_component_library load libloader.la loader_component_library load libmapper.la mapper_component_library load libmemory.la mem_component_library -load libmmu.la mmu_component_library load libsched.la sched_component_library -load libtimers.la timer_component_library # Components -new hw-cpu-arm7t cpu new sw-load-elf loader new sid-io-stdio stdio -new sw-gloss-arm/angel angel -new hw-interrupt-arm/ref intctrl new hw-mapper-basic bus -new hw-remap/pause-arm/ref remapper new sid-sched-host host-sched new sid-sched-sim target-sched new hw-memory-ram/rom-basic mem -new hw-timer-arm/ref-sched timer1 -new hw-timer-arm/ref-sched timer2 # Scheduler diff --git a/sid/component/testsuite/sidcomp.cfgroot/setInvComp.expect b/sid/component/testsuite/sidcomp.cfgroot/setInvComp.expect index 1e805dfa02..804e804212 100644 --- a/sid/component/testsuite/sidcomp.cfgroot/setInvComp.expect +++ b/sid/component/testsuite/sidcomp.cfgroot/setInvComp.expect @@ -1,8 +1,8 @@ -setInvComp.badconf:35: component target not found -setInvComp.badconf:36: component 0-control not found -setInvComp.badconf:38: component set not found -setInvComp.badconf:43: component mem not found -setInvComp.badconf:44: component ~/mem not found -setInvComp.badconf:45: component _cpu not found -setInvComp.badconf:46: component ..cpu not found +setInvComp.badconf:24: component target not found +setInvComp.badconf:25: component 0-control not found +setInvComp.badconf:27: component set not found +setInvComp.badconf:32: component mem not found +setInvComp.badconf:33: component ~/mem not found +setInvComp.badconf:34: component _cpu not found +setInvComp.badconf:35: component ..cpu not found Configuration error. Aborting. diff --git a/sid/component/testsuite/sidcomp.cfgroot/wrongOrd3.badconf b/sid/component/testsuite/sidcomp.cfgroot/wrongOrd3.badconf index 6aa2ad28d5..2aac415d5d 100644 --- a/sid/component/testsuite/sidcomp.cfgroot/wrongOrd3.badconf +++ b/sid/component/testsuite/sidcomp.cfgroot/wrongOrd3.badconf @@ -5,16 +5,12 @@ set main verbose? 0 # component libraries -load libcgencpu.la cgen_component_library load libconsoles.la console_component_library load libgloss.la gloss_component_library -load libinterrupt.la interrupt_component_library load libloader.la loader_component_library load libmapper.la mapper_component_library load libmemory.la mem_component_library -load libmmu.la mmu_component_library load libsched.la sched_component_library -load libtimers.la timer_component_library # Bus connections before instantiation connect-bus remapper all bus access-port @@ -24,24 +20,18 @@ connect-bus bus [0,0x7fffff] mem read-write-port # Components -new hw-cpu-arm7t cpu new sw-load-elf loader new sid-io-stdio stdio -new sw-gloss-arm/angel angel -new hw-interrupt-arm/ref intctrl new hw-mapper-basic bus -new hw-remap/pause-arm/ref remapper new sid-sched-host host-sched new sid-sched-sim target-sched new hw-memory-ram/rom-basic mem -new hw-timer-arm/ref-sched timer1 -new hw-timer-arm/ref-sched timer2 # connect pin commands executed before set num-client for target-sched and host-sched -connect-pin target-sched 0-control <- timer1 divided-clock-control -connect-pin target-sched 1-control <- timer2 divided-clock-control -connect-pin target-sched 0-event -> timer1 divided-clock-event -connect-pin target-sched 1-event -> timer2 divided-clock-event +connect-pin target-sched 0-control <- stdio poll +connect-pin target-sched 1-control <- stdio poll +connect-pin target-sched 0-event -> stdio poll +connect-pin target-sched 1-event -> stdio poll connect-pin host-sched 0-event -> stdio poll diff --git a/sid/component/testsuite/sidcomp.cfgroot/wrongOrd3.expect b/sid/component/testsuite/sidcomp.cfgroot/wrongOrd3.expect index a7d44590df..4576ef7f01 100644 --- a/sid/component/testsuite/sidcomp.cfgroot/wrongOrd3.expect +++ b/sid/component/testsuite/sidcomp.cfgroot/wrongOrd3.expect @@ -1,10 +1,10 @@ -wrongOrd3.badconf:20: component remapper not found -wrongOrd3.badconf:21: component cpu not found -wrongOrd3.badconf:22: component angel not found -wrongOrd3.badconf:23: component bus not found -wrongOrd3.badconf:42: component target-sched has no input pin 0-control -wrongOrd3.badconf:43: component target-sched has no input pin 1-control -wrongOrd3.badconf:44: component target-sched has no output pin 0-event -wrongOrd3.badconf:45: component target-sched has no output pin 1-event -wrongOrd3.badconf:46: component host-sched has no output pin 0-event +wrongOrd3.badconf:16: component remapper not found +wrongOrd3.badconf:17: component cpu not found +wrongOrd3.badconf:18: component angel not found +wrongOrd3.badconf:19: component bus not found +wrongOrd3.badconf:32: component target-sched has no input pin 0-control +wrongOrd3.badconf:33: component target-sched has no input pin 1-control +wrongOrd3.badconf:34: component target-sched has no output pin 0-event +wrongOrd3.badconf:35: component target-sched has no output pin 1-event +wrongOrd3.badconf:36: component host-sched has no output pin 0-event Configuration error. Aborting. -- 2.11.0