Sync, Seem to pass all except dynamic_o0 which is probably a freertos test setup issue

This commit is contained in:
Dolu1990 2018-08-14 11:51:53 +02:00
parent 32fe1dcbd4
commit 91773ec7d5
28 changed files with 2988 additions and 2937 deletions

View File

@ -20,7 +20,6 @@ object FormalSimple extends App{
catchAccessFault = false,
compressedGen = true
),
new DBusSimplePlugin(
catchAddressMisaligned = true,
catchAccessFault = false

View File

@ -187,6 +187,8 @@ public:
VerilatedVcdC* tfp;
#endif
uint32_t seed;
bool withInstructionReadCheck = true;
void setIStall(bool enable) { iStall = enable; }
void setDStall(bool enable) { dStall = enable; }
@ -199,6 +201,8 @@ public:
Workspace(string name){
//seed = VL_RANDOM_I(32)^VL_RANDOM_I(32)^0x1093472;
//srand48(seed);
// setIStall(false);
// setDStall(false);
staticMutex.lock();
@ -498,7 +502,7 @@ public:
staticMutex.unlock();
} catch (const std::exception& e) {
staticMutex.lock();
cout << "FAIL " << name << endl;
cout << "FAIL " << name << endl; //<< " seed : " << seed <<
cycles += instanceCycles;
staticMutex.unlock();
failed = true;
@ -1744,6 +1748,7 @@ string freeRtosTests[] = {
"AltQTest", "AltBlock", "AltPollQ", "blocktim", "countsem", "dead", "EventGroupsDemo", "flop", "integer", "QPeek",
"QueueSet", "recmutex", "semtest", "TaskNotify", "BlockQ", "crhook", "dynamic",
"GenQTest", "PollQ", "QueueOverwrite", "QueueSetPolling", "sp_flop", "test1"
//"BlockQ","BlockQ","BlockQ","BlockQ","BlockQ","BlockQ","BlockQ","BlockQ"
// "flop"
// "flop", "sp_flop" // <- Simple test
// "AltBlckQ" ???

View File

@ -1 +1,2 @@
/gcloud.pyc
*.tar.gz

View File

@ -18,11 +18,14 @@ class GCInstance:
self.create("custom-{}-{}".format(cores,ram))
#n1-highcpu-8
def create(self, machine="f1-micro"):
def create(self, machine="f1-micro", args = "--preemptible"):
self.delete()
self.local('gcloud beta compute --project=ivory-infusion-209508 instances create {} --zone=europe-west1-b --machine-type={} --subnet=default --network-tier=PREMIUM --no-restart-on-failure --maintenance-policy=TERMINATE --preemptible --service-account=470010940365-compute@developer.gserviceaccount.com --scopes=https://www.googleapis.com/auth/devstorage.read_only,https://www.googleapis.com/auth/logging.write,https://www.googleapis.com/auth/monitoring.write,https://www.googleapis.com/auth/servicecontrol,https://www.googleapis.com/auth/service.management.readonly,https://www.googleapis.com/auth/trace.append --disk=name=miaou,device-name=miaou,mode=rw,boot=yes'.format(self.instance, machine))
self.local('gcloud beta compute --project=ivory-infusion-209508 instances create {} --zone=europe-west1-b --machine-type={} --subnet=default --network-tier=PREMIUM --no-restart-on-failure --maintenance-policy=TERMINATE {} --service-account=470010940365-compute@developer.gserviceaccount.com --scopes=https://www.googleapis.com/auth/devstorage.read_only,https://www.googleapis.com/auth/logging.write,https://www.googleapis.com/auth/monitoring.write,https://www.googleapis.com/auth/servicecontrol,https://www.googleapis.com/auth/service.management.readonly,https://www.googleapis.com/auth/trace.append --disk=name=miaou,device-name=miaou,mode=rw,boot=yes'.format(self.instance, machine, args))
def stopScript(self, script):
self.local('gcloud compute --project {} instances add-metadata {} --metadata-from-file shutdown-script={} --zone "{}"'.format(self.project, self.instance, script, self.zone))
def start(self):
self.local('gcloud compute --project "{}" instances start --zone "{}" "{}"'.format(self.project, self.zone, self.instance)) # --machine-type=f1-micro
time.sleep(60)

View File

@ -5,6 +5,6 @@ from gcloud import GCInstance
gci = GCInstance("vexriscv")
gci.create()
gci.start()
gci.remoteToLocal("VexRiscv/sbtTest.txt","sbtTest.txt")
gci.remoteToLocal("run.txt","run.txt")
gci.stop()
gci.delete()

View File

@ -6,9 +6,10 @@ from sys import argv
from gcloud import GCInstance
gci = GCInstance("vexriscv")
gci.create("n1-highcpu-8")
gci.create("n1-highcpu-8","")
gci.start()
gci.stopHours(20)
gci.stopScript("src/test/python/gcloud/stopScript.sh")
gci.local("rm -rf archive.tar.gz; git ls-files -z | xargs -0 tar -czf archive.tar.gz")
gci.localToRemote("archive.tar.gz", "")

View File

@ -4,7 +4,7 @@ mkdir VexRiscv
tar -xzf archive.tar.gz -C VexRiscv
cd VexRiscv
export VEXRISCV_REGRESSION_CONFIG_COUNT=16
export VEXRISCV_REGRESSION_CONFIG_COUNT=32
export VEXRISCV_REGRESSION_FREERTOS_COUNT=yes
sbt test
cd ..

View File

@ -0,0 +1,4 @@
#! /bin/bash
echo "preempted :(" | mail -s "VexRiscv cloud" charles.papon.90@gmail.com -A /home/spinalvm/run.txt
sleep 10

27
src/test/python/gcloud/try.py Executable file
View File

@ -0,0 +1,27 @@
#!/usr/bin/env python
from os import system
from sys import argv
project = "ivory-infusion-209508"
zone = "europe-west1-b"
instance = "miaou"
def local(cmd):
print(cmd)
system(cmd)
def remote(cmd):
cmd = 'gcloud compute --project "{}" ssh --zone "{}" "{}" -- "{}"'.format(project, zone, instance, cmd)
print(cmd)
system(cmd)
def localToRemote(source, target):
remote("rm -rf target")
cmd = 'gcloud compute --project "{}" scp --zone "{}" {} {}:{}'.format(project, zone, source, instance, target)
print(cmd)
system(cmd)
#local("sbt test &")
local("python -c 'from os import system; system(\"(sbt test >> sbtTest.txt) &\")'")
#python -c 'from os import system; system("sbt test")' &

View File

@ -1844,7 +1844,7 @@
:107320008328C100E398A8FC0325C10013030500CE
:107330009303000013170300930600000325810048
:107340009305050013060000B3E7B6003368C700D5
:10735000370710F0130587F4B7150000938505FA79
:10735000370710F0130587F4B7250000938585B52E
:1073600013060000B386B70093880600B3B8F80090
:107370003307C800B387E800138707009387060028
:10738000130807002320F500232205011300000045

View File

@ -1772,11 +1772,11 @@
:106EA000EFF04F9B8327C100238007000325C1001B
:106EB0008320C102330585400324810213010105AB
:106EC00067800000B70710F083A647F403A607F415
:106ED00003A747F4E31AD7FEB7160000938606FA15
:106ED00003A747F4E31AD7FEB7260000938686B5CA
:106EE000B306D60033B6C600B305E60023A4D7F434
:106EF00023A6B7F467800000B70710F003A747F494
:106F000003A607F483A647F4E31AD7FEB7160000DA
:106F1000938606FAB306D60033B6C60023A4D7F488
:106F000003A607F483A647F4E31AD7FEB7260000CA
:106F1000938686B5B306D60033B6C60023A4D7F44D
:106F2000B305E60023A6B7F49307000873A0473023
:106F300067800000130101FF232481002326110034
:106F40009797010093878766179401001304C4651F

View File

@ -1148,7 +1148,7 @@
:1047A000370510F0130545F40841B248E39EA8FC14
:1047B00032452A8381431317030081462245AA8587
:1047C0000146B3E7B6003368C700370710F013059A
:1047D00087F48565938505FA0146B386B700B688E8
:1047D00087F48965938585B50146B386B700B688A9
:1047E000B3B8F8003307C800B387E8003E87B68740
:1047F0003A881CC123220501010041018280411138
:1048000006C651379307000873A047300100B24035

View File

@ -1239,10 +1239,10 @@
:104D5000C2C4C6C61ACEEFF06FD4B2472380070094
:104D60003245B250018D225461618280B70710F044
:104D700083A647F403A607F403A747F4E31AD7FE74
:104D80008566938606FAB29633B6C600B305E6008A
:104D80008966938686B5B29633B6C600B305E6004B
:104D900023A4D7F423A6B7F48280B70710F003A7A3
:104DA00047F403A607F483A647F4E31AD7FE856603
:104DB000938606FAB29633B6C60023A4D7F4B30599
:104DA00047F403A607F483A647F4E31AD7FE8966FF
:104DB000938686B5B29633B6C60023A4D7F4B3055E
:104DC000E60023A6B7F49307000873A0473082805B
:104DD000411122C406C697B701009387277D17B4F7
:104DE00001001304647C98431C401306F07C930676

View File

@ -1770,10 +1770,10 @@
:106E80008327C100238007000325C1008320C1029E
:106E9000330585400324810213010105678000004A
:106EA000B70710F083A647F403A607F403A747F437
:106EB000E31AD7FEB7160000938606FAB306D6008B
:106EB000E31AD7FEB7260000938686B5B306D60040
:106EC00033B6C600B305E60023A4D7F423A6B7F46F
:106ED00067800000B70710F003A747F403A607F484
:106EE00083A647F4E31AD7FEB7160000938606FA86
:106EE00083A647F4E31AD7FEB7260000938686B53B
:106EF000B306D60033B6C60023A4D7F4B305E60024
:106F000023A6B7F49307000873A0473067800000FA
:106F1000130101FF2324810023261100979701000C

View File

@ -1237,10 +1237,10 @@
:104D3000BEC236DEBAC0C2C4C6C61ACEEFF06FD449
:104D4000B247238007003245B250018D2254616181
:104D50008280B70710F083A647F403A607F403A7E1
:104D600047F4E31AD7FE8566938606FAB29633B601
:104D600047F4E31AD7FE8966938686B5B29633B6C2
:104D7000C600B305E60023A4D7F423A6B7F48280C7
:104D8000B70710F003A747F403A607F483A647F478
:104D9000E31AD7FE8566938606FAB29633B6C60046
:104D9000E31AD7FE8966938686B5B29633B6C60007
:104DA00023A4D7F4B305E60023A6B7F493070008BD
:104DB00073A047308280411122C406C697B7010014
:104DC0009387077317B401001304447298431C407F

View File

@ -1844,7 +1844,7 @@
:107320008328C100E398A8FC0325C10013030500CE
:107330009303000013170300930600000325810048
:107340009305050013060000B3E7B6003368C700D5
:10735000370710F0130587F4B7150000938505FA79
:10735000370710F0130587F4B7250000938585B52E
:1073600013060000B386B70093880600B3B8F80090
:107370003307C800B387E800138707009387060028
:10738000130807002320F500232205011300000045

View File

@ -1772,11 +1772,11 @@
:106EA000EFF04F9B8327C100238007000325C1001B
:106EB0008320C102330585400324810213010105AB
:106EC00067800000B70710F083A647F403A607F415
:106ED00003A747F4E31AD7FEB7160000938606FA15
:106ED00003A747F4E31AD7FEB7260000938686B5CA
:106EE000B306D60033B6C600B305E60023A4D7F434
:106EF00023A6B7F467800000B70710F003A747F494
:106F000003A607F483A647F4E31AD7FEB7160000DA
:106F1000938606FAB306D60033B6C60023A4D7F488
:106F000003A607F483A647F4E31AD7FEB7260000CA
:106F1000938686B5B306D60033B6C60023A4D7F44D
:106F2000B305E60023A6B7F49307000873A0473023
:106F300067800000130101FF232481002326110034
:106F4000979701009387476717940100130484669D

View File

@ -1148,7 +1148,7 @@
:1047A000370510F0130545F40841B248E39EA8FC14
:1047B00032452A8381431317030081462245AA8587
:1047C0000146B3E7B6003368C700370710F013059A
:1047D00087F48565938505FA0146B386B700B688E8
:1047D00087F48965938585B50146B386B700B688A9
:1047E000B3B8F8003307C800B387E8003E87B68740
:1047F0003A881CC123220501010041018280411138
:1048000006C651379307000873A047300100B24035

View File

@ -1239,10 +1239,10 @@
:104D5000C2C4C6C61ACEEFF06FD4B2472380070094
:104D60003245B250018D225461618280B70710F044
:104D700083A647F403A607F403A747F4E31AD7FE74
:104D80008566938606FAB29633B6C600B305E6008A
:104D80008966938686B5B29633B6C600B305E6004B
:104D900023A4D7F423A6B7F48280B70710F003A7A3
:104DA00047F403A607F483A647F4E31AD7FE856603
:104DB000938606FAB29633B6C60023A4D7F4B30599
:104DA00047F403A607F483A647F4E31AD7FE8966FF
:104DB000938686B5B29633B6C60023A4D7F4B3055E
:104DC000E60023A6B7F49307000873A0473082805B
:104DD000411122C406C697B701009387E77D17B437
:104DE00001001304247D98431C401306F07C9306B5

View File

@ -1770,10 +1770,10 @@
:106E80008327C100238007000325C1008320C1029E
:106E9000330585400324810213010105678000004A
:106EA000B70710F083A647F403A607F403A747F437
:106EB000E31AD7FEB7160000938606FAB306D6008B
:106EB000E31AD7FEB7260000938686B5B306D60040
:106EC00033B6C600B305E60023A4D7F423A6B7F46F
:106ED00067800000B70710F003A747F403A607F484
:106EE00083A647F4E31AD7FEB7160000938606FA86
:106EE00083A647F4E31AD7FEB7260000938686B53B
:106EF000B306D60033B6C60023A4D7F4B305E60024
:106F000023A6B7F49307000873A0473067800000FA
:106F1000130101FF2324810023261100979701000C

View File

@ -1237,10 +1237,10 @@
:104D3000BEC236DEBAC0C2C4C6C61ACEEFF06FD449
:104D4000B247238007003245B250018D2254616181
:104D50008280B70710F083A647F403A607F403A7E1
:104D600047F4E31AD7FE8566938606FAB29633B601
:104D600047F4E31AD7FE8966938686B5B29633B6C2
:104D7000C600B305E60023A4D7F423A6B7F48280C7
:104D8000B70710F003A747F403A607F483A647F478
:104D9000E31AD7FE8566938606FAB29633B6C60046
:104D9000E31AD7FE8966938686B5B29633B6C60007
:104DA00023A4D7F4B305E60023A6B7F493070008BD
:104DB00073A047308280411122C406C697B7010014
:104DC0009387C77317B401001304047398431C40FE

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -12,7 +12,7 @@
:1000A000657501461122170502001305A53E970547
:1000B00002009385A53E0146C52817A50300130538
:1000C000A57397B503009385E57237B6ABAB1306FE
:1000D000B6BAD92817B1030013010172EF40D0015D
:1000D000B6BAD92817B1030013010172EF40F0013D
:1000E000860293D21200F512638802008242110147
:1000F0006F00001073002030824211017300203025
:10010000711116C0F3222034E3CC02FC82421101AB
@ -49,7 +49,7 @@
:1002F000220523A4320523A6420523A8520523AADA
:10030000620523AC720523AE820523A0920723A2C7
:10031000A20723A4B20723A6C20723A8D20723AAB1
:10032000E20723ACF207EF40604D17010200032102
:10032000E20723ACF207EF40804D170102000321E2
:1003300061160241F65273901234B7220000938284
:10034000028873A0023082403242C2425243E243EA
:10035000724482541255A2553256C2565257E25731
@ -526,7 +526,7 @@
:1020C000B247A1079C4322476318F700B247B10704
:1020D0009C4322476308F70497E701009387873BF7
:1020E000984397E701009387E73A9C439387470318
:1020F000BE853A85EF20900F35A097E701009387C2
:1020F000BE853A85EF20B00F35A097E701009387A2
:10210000E7519C4381E77370043001A097E7010019
:102110009387C7509C431387F7FF97E70100938786
:10212000E74F98C397E701009387474F984397E697
@ -998,7 +998,7 @@
:103E4000DC436247E3E9E7FE82579843F24798C3B1
:103E50008257724798C397C701009387E7649843D6
:103E6000B257DC431D8F97C701009387E76398C360
:103E7000EFD0DFD8925799E3EF00B03692573E85E6
:103E7000EFD0DFD8925799E3EF00D03692573E85C6
:103E8000F25021618280797106D62AC6B2473ECCB3
:103E9000B247BDC3A147B307F0406247BA973ECCD3
:103EA000E2473ECAEFD0DFD3D247DC433EC8975744
@ -1148,266 +1148,266 @@
:1047A000370510F0130545F40841B248E39EA8FC14
:1047B00032452A8381431317030081462245AA8587
:1047C0000146B3E7B6003368C700370710F013059A
:1047D00087F49305007D0146B386B700B688B3B869
:1047E000F8003307C800B387E8003E87B6873A88E9
:1047F0001CC123220501010041018280411106C62E
:1048000059379307000873A047300100B2404101B7
:104810008280011106CE2AC617C501001305059B2B
:10482000EFF0DFE50100F24005618280011106CE64
:104830002AC617C501001305E599EFF03FE4010012
:10484000F24005618280797106D62AC602CE29A07F
:104850000100F24785073ECE724785679387773818
:10486000E3D8E7FE17C5010013054597EFF01FE1F8
:10487000F1BF411106C64922EF00E07BEF00102C8A
:104880000100B24041018280011106CE02C6EF0054
:10489000C0722A878547630CF70017C5010013050E
:1048A0006594EFF0BFDDB24793E727003EC6EF0007
:1048B00030212A878547630CF70017C501001305CF
:1048C000A594EFF0BFDBB24793E747003EC6EF0089
:1048D00090662A878547630CF70017C5010013050A
:1048E0002595EFF0BFD9B24793E787003EC6B247A0
:1048F0003E85F24005618280011106CE02C6953FD9
:104900001707000013076704814605469305400614
:1049100017C5010013050594EFE03F982AC6B2477A
:1049200099CBEFD06FC2AA87014781463E86854565
:104930003245EFE0BF9C02C4EFD0AFA081473E8577
:10494000F24005618280797106D62AC697C70100B8
:10495000938787B49C431387470697C701009387C3
:10496000A7B398C397C70100938747B39C431387A6
:10497000470697C70100938767B298C397C701009E
:10498000938787B198438567938777BB63D5E7049F
:1049900097C70100938747B09843FD779387874473
:1049A0003E9797C70100938727AF98C3F13D2ACE62
:1049B000F24799EB97C70100938747AE9843896701
:1049C0009387773263DBE700F2473E85EFF0FFC95C
:1049D000EFD00F9F21A0010011A00100B25045614E
:1049E00082807370043001A00100828041112AC6C8
:1049F0002EC47370043001A0411106C601469145D2
:104A00001545EFB05FD52A8797570300938787D363
:104A100098C3975703009387E7D29C4397C501003B
:104A2000938505843E85EFC00FFC8148014881478E
:104A3000094781461306004097C501009385858389
:104A4000170500001305C503EFC03F8981480148E1
:104A500097570300938747CF0547814613060040C9
:104A600097C50100938585811705000013058541D1
:104A7000EFC0BF860100B24041018280397106DE7D
:104A80002AC602D0A5A882572947B317F7003ED6F9
:104A9000EFD08FAB2AD4975703009387A7CA9C43C4
:104AA000780881463256BA853E85EFC02F98AA878E
:104AB00099C7975703009387E7C9054798C3EFD075
:104AC000AFA82A87A257B307F7403ED21257B25772
:104AD0006378F700975703009387C7C7054798C3C4
:104AE000B257BD07125763F8E70097570300938743
:104AF00067C6054798C3825785073ED0025791473E
:104B0000E3D3E7F802D015A897570300938787C32C
:104B10009C43181081460146BA853E85EFB05FE49C
:104B20002A8785476308F70097570300938787C252
:104B3000054798C3825785073ED002579147E3D572
:104B4000E7FC02D0A5A882572947B317F7003ED645
:104B5000EFD08F9F2AD4975703009387A7BE9C431B
:104B6000181081463256BA853E85EFB07FDFAA879E
:104B700099C7975703009387E7BD054798C3EFD0C0
:104B8000AF9C2A87A257B307F7403ED21257B257BD
:104B90006378F700975703009387C7BB054798C30F
:104BA000B257BD07125763F8E70097570300938782
:104BB00067BA054798C3825785073ED00257914789
:104BC000E3D3E7F897570300938707B923A00700BB
:104BD00097570300938747B79C433E85EFC0FFDF9D
:104BE00021A05145EFC09FA2975703009387C7B6F6
:104BF000984393075005E316F7FE5145EFC01FA1F8
:104C000097570300938747B523A0070002D0C1A0A0
:104C100097570300938707B39C4378088146014662
:104C2000BA853E85EFC08F802A8785476308F700E5
:104C300097570300938707B2054798C39757030018
:104C4000938747B09C43181081460146BA853E853C
:104C5000EFB01FD12A8785476308F70097570300F5
:104C6000938747AF054798C3975703009387C7AE0D
:104C70009843930750056318F700975703009387ED
:104C800067AD054798C3975703009387E7AB9C43ED
:104C900091453E85EFC0FFAD975703009387C7ABA3
:104CA0009843930750056318F700975703009387BD
:104CB00067AA054798C3975703009387E7A89C43C3
:104CC00085453E85EFC0FFAA825785073ED0025733
:104CD0009147E3DFE7F221A05145EFC03F9397579B
:104CE0000300938767A7984393075005E316F7FEE1
:104CF0005145EFC0BF91975703009387E7A523A0C5
:104D0000070002D015A8975703009387A7A39C43D9
:104D1000780881460146BA853E85EFB03FF12A8783
:104D200085476308F700975703009387A7A20547B5
:104D300098C3825785073ED002579147E3D5E7FCD9
:104D400097570300938747A09C433E85EFC0FFC859
:104D500021A05145EFC09F8B975703009387C79FB2
:104D6000984393075005E316F7FE5145EFC01F8A9D
:104D7000975703009387479E23A0070002D0C1A046
:104D8000975703009387079C9C4318108146014660
:104D9000BA853E85EFB0DFBC2A8785476308F700F8
:104DA000975703009387079B054798C397570300BE
:104DB000938747999C43780881460146BA853E858A
:104DC000EFB0DFE62A8785476308F70097570300AF
:104DD00093874798054798C3975703009387C797CA
:104DE0009843930750056318F7009757030093877C
:104DF0006796054798C3975703009387E7949C43AA
:104E000091453E85EFC0FF96975703009387C7945F
:104E10009843930750056318F7009757030093874B
:104E20006793054798C3975703009387E7919C437F
:104E300085453E85EFC0FF93825785073ED00257D8
:104E40009147E3DFE7F221A05145EFC02FFC9757D0
:104E5000030093876790984393075005E316F7FE86
:104E60005145EFC0AFFA975703009387278E9C43B5
:104E700013871700975703009387478D98C311B185
:104E8000797106D62AC60145EFC01FA3EFC0DFEB3C
:104E90002ACE02CA975703009387078C1307500541
:104EA00098C3975703009387E7899C435808814626
:104EB0001306F00ABA853E85EFB09FAAAA8799C764
:104EC0009757030093870789054798C3EFC0DFE72B
:104ED0002A87F247B307F7403ECC62479307E00AC0
:104EE00063E8E700975703009387C786054798C391
:104EF00062479307E00B63F8E70097570300938737
:104F00006785054798C3975703009387E78413077E
:104F1000500598C30145EFC03F9AEFC0FFE22ACE8B
:104F200097570300938747831307500598C39757F4
:104F30000300938727819C43580881461306F00A93
:104F4000BA853E85EFB09FCEAA8799C797570300D1
:104F500093874780054798C3EFC01FDF2A87F24732
:104F6000B307F7403ECC62479307E00A63E8E700E7
:104F7000974703009387077E054798C362479307C7
:104F8000E00B63F8E700974703009387A77C05478A
:104F900098C3974703009387277C1307500598C34E
:104FA000974703009387C77A9C4313871700974757
:104FB00003009387E77998C3F9B5411185473EC649
:104FC0009747030093878778984397470300938711
:104FD000E7789C436313F70002C697470300938763
:104FE0002777984397470300938787779C436313FA
:104FF000F70002C6974703009387C7759843854714
:105000006313F70002C697470300938767749843BA
:10501000974703009387C77498C397470300938704
:10502000E7729843974703009387477398C3B24743
:105030003E8541018280411106C69305800C13050F
:10504000800CEFB07F8D2A87974703009387C77145
:1050500098C397470300938727711307A00AD8C303
:10506000974703009387477023A4070081451305E2
:10507000800CEFB07F8A2A87974703009387C76E1B
:10508000D8C7974703009387276E23A80700974741
:1050900003009387676D23AA070097470300938750
:1050A000A76C9C4397B501009385C51D3E85EFC055
:1050B0008F93974703009387276BDC4797B50100D1
:1050C0009385451D3E85EFC00F9297470300938758
:1050D000A7699C4399E7974703009387E768DC47F4
:1050E000A9CB814801488147014797460300938631
:1050F000A6671306004097B501009385A51A17050A
:1051000000001305C515EFC04F9D81480148814738
:105110000147974603009386E6651306004097B55E
:1051200001009385A5181705000013054513EFC06E
:10513000CF9A0100B24041018280797106D62AC619
:105140002EC48146014681453245EFB07F812A87D2
:1051500085476318F700974703009387A7600547C3
:1051600098C302CE15A88146014681453245EFB06D
:10517000FFAB2A8785476308F700974703009387AB
:10518000675E054798C3A2479C4313871700A24751
:1051900098C3F24785073ECE72479307700CE3F43D
:1051A000E7FC8146014681453245EFB03FA82A879A
:1051B00085476318F700974703009387A75A054769
:1051C00098C30100B25045618280797106D62AC623
:1051D0002EC48146014681453245EFB03FA52A875E
:1051E00085476318F700974703009387A75705473C
:1051F00098C302CE15A88146014681453245EFB0DD
:105200002FF62A8785476308F7009747030093879F
:105210006755054798C3A2479C4313871700A247C9
:1052200098C3F24785073ECE72479307700CE3F4AC
:10523000E7FC8146014681453245EFB06FF22A878F
:1052400085476318F700974703009387A7510547E1
:1052500098C30100B25045618280797106D62AC692
:10526000B2473ECEF247D8439307A00A6319F7002E
:10527000F2479843F247A107BE853A857D3DF24744
:105280009C438146014681453E85EFB03F9A2A877F
:1052900085476318F700974703009387A74C054796
:1052A00098C3F2479843F247A107BE853A85313F3C
:1052B000F2479843F247A107BE853A85BD3DD5B771
:1052C000411185473EC6974703009387A7499C43F2
:1052D00091C302C6974703009387074998479747AA
:1052E00003009387E7499C436314F70002C619A89B
:1052F000974703009387474798479747030093874B
:10530000274898C39747030093870746D84B97478A
:105310000300938727479C436314F70002C619A82C
:105320009747030093874744D84B974703009387D9
:10533000674598C3B2473E8541018280411106C648
:105340001145EFB00FCA2A87974703009387C743D9
:1053500098C397470300938727439C4397B5010061
:10536000938545F53E85EFB01FE897470300938787
:10537000A7419C43B5CB81480148974703009387D9
:105380006742094781461306004097B5010093859F
:1053900065F3170500001305E505EFB01FF481481C
:1053A0000148974703009387274005478146130626
:1053B000004097B50100938565F1170500001305BE
:1053C0006513EFB09FF1814801488147014781464D
:1053D0001306004097B501009385C5EF170500003F
:1053E0001305451EEFB07FEF0100B24041018280FE
:1053F000797106D62AC6974703009387E7389C43FE
:105400003E85EFB0EFC52A8785476318F7009747B9
:1054100003009387A737054798C302CE15A897477F
:105420000300938767369C43A1453E85EFB08FC844
:105430002A8785476308F700974703009387073556
:10544000054798C35145EFC06F9CF24785073ECE94
:105450007247A547E3F5E7FC02CE0DA85145EFC022
:10546000EF9A97470300938727329C433E85EFB01E
:105470002FBF2A8785476308F70097470300938764
:10548000E730054798C3F24785073ECE7247A547E8
:10549000E3F6E7FC974703009387072F9C433E857D
:1054A000EFB00FBC2A8785476318F70097470300C2
:1054B0009387C72D054798C3974703009387C72D48
:1054C0009C4313871700974703009387E72C98C3E3
:1054D000974703009387C72B054798C30145EFC043
:1054E000AFBD974703009387A72A23A0070021B7E2
:1054F000011106CE2AC6974703009387E7289C43ED
:10550000F9553E85EFB00FBB2A8785476313F70631
:10551000974703009387C727984385476309F70098
:105520009747030093878726054798C389A897471D
:105530000300938767259C433E85EFB06FB22A87AF
:1055400085476308F700974703009387272405479B
:1055500098C3974703009387E723054798C30145FE
:10556000EFC08FB5974703009387C72223A007009A
:1055700039A09747030093876721054798C397474A
:1055800003009387A7219C431387170097470300C5
:10559000938787209C436308F7009747030093870E
:1055A000E71E054798C3974703009387271F9C432F
:1055B00013871700974703009387471E98C325BF9B
:1055C000011106CE2AC6974703009387E71B9C4329
:1055D00081453E85EFB00FAE2A878547E315F7FE7C
:1055E000974703009387071C9C433E85EFC0CF87F6
:1055F0002A878D476305F7007370043001A0974731
:1056000003009387671A9C433E85EFC0EF852A8786
:105610008D476305F7007370043001A097470300BE
:105620009387471798438547631AF7009747030006
:1056300093870716984385476309F7009747030048
:105640009387C714054798C3F5A09747030093872E
:1056500027159C4313871700974703009387471428
:1056600098C397470300938727149C433E85EFC058
:10567000CFB6974703009387E7129C433E85EFC060
:10568000CFB5974703009387E71098438547630A90
:10569000F700974703009387A70F98438547631840
:1056A000F700974703009387670E054798C30145A6
:1056B000EFC06F852A8789476305F7007370043050
:1056C00001A0974703009387E70D9C433E85EFB009
:1056D000BFF92A8789476305F7007370043001A07A
:1056E000974703009387470C9C433E85EFB0DFF755
:1056F0002A8789476305F7007370043001A0974734
:105700000300938767089C433E85EFB06F952A8717
:1057100085476308F70097470300938727070547E6
:1057200098C30145EFB03FFEAA87E38E07E8737088
:10573000043001A049BD4111974703009387070733
:10574000984397470300938727059C436319F70005
:105750009747030093878703054798C319A897477E
:1057600003009387670398439747030093870704D1
:1057700098C3974703009387A7039843974703006D
:105780009387C7019C436319F700974703009387EA
:10579000E7FF054798C319A89747030093870700B9
:1057A0009843974703009387A70098C39747030040
:1057B00093874700984397470300938767FE9C436E
:1057C0006319F70097470300938747FC054798C381
:1057D00019A8974703009387A7FC984397470300AE
:1057E000938747FD98C397470300938727FA984309
:1057F00085476314F70002C619A085473EC6B24725
:105800003E85410182800000B305B5009307050085
:1047D00087F48565938585380146B386B700B6882A
:1047E000B3B8F8003307C800B387E8003E87B68740
:1047F0003A881CC123220501010041018280411138
:1048000006C651379307000873A047300100B24035
:1048100041018280011106CE2AC617C50100130589
:10482000E59AEFF0BFE50100F240056182800111D9
:1048300006CE2AC617C501001305C599EFF01FE47F
:104840000100F24005618280797106D62AC602CE47
:1048500029A00100F24785073ECE724785679387FE
:104860007738E3D8E7FE17C5010013052597EFF069
:10487000FFE0F1BF411106C64922EF00E07BEF00E7
:10488000102C0100B24041018280011106CE02C607
:10489000EF00C0722A878547630CF70017C5010037
:1048A00013054594EFF09FDDB24793E727003EC61E
:1048B000EF0030212A878547630CF70017C50100F8
:1048C00013058594EFF09FDBB24793E747003EC6A0
:1048D000EF0090662A878547630CF70017C5010033
:1048E00013050595EFF09FD9B24793E787003EC6C1
:1048F000B2473E85F24005618280011106CE02C6B4
:10490000953F170700001307670481460546930586
:10491000400617C501001305E593EFE01F982AC66E
:10492000B24799CBEFD04FC2AA87014781463E8656
:1049300085453245EFE09F9C02C4EFD08FA08147B0
:104940003E85F24005618280797106D62AC697C7F6
:104950000100938767B49C431387470697C70100FC
:10496000938787B398C397C70100938727B39C4366
:104970001387470697C70100938747B298C397C725
:104980000100938767B198438567938777BB63D5A9
:10499000E70497C70100938727B09843FD77938773
:1049A00087443E9797C70100938707AF98C3F13DAF
:1049B0002ACEF24799EB97C70100938727AE984319
:1049C00089679387773263DBE700F2473E85EFF034
:1049D000DFC9EFD0EF9E21A0010011A00100B2506D
:1049E000456182807370043001A001008280411112
:1049F0002AC62EC47370043001A0411106C60146B8
:104A000091451545EFB03FD52A8797570300938707
:104A100067D398C3975703009387C7D29C4397C522
:104A200001009385E5833E85EFC0EFFB8148014897
:104A30008147094781461306004097C501009385C9
:104A40006583170500001305C503EFC01F89814862
:104A5000014897570300938727CF054781461306E0
:104A6000004097C501009385658117050000130577
:104A70008541EFC09F860100B240410182803971BB
:104A800006DE2AC602D0A5A882572947B317F70029
:104A90003ED6EFD06FAB2AD497570300938787CACF
:104AA0009C43780881463256BA853E85EFC00F9800
:104AB000AA8799C7975703009387C7C9054798C323
:104AC000EFD08FA82A87A257B307F7403ED21257DC
:104AD000B2576378F700975703009387A7C7054736
:104AE00098C3B257BD07125763F8E7009757030002
:104AF000938747C6054798C3825785073ED002571C
:104B00009147E3D3E7F802D015A89757030093879E
:104B100067C39C43181081460146BA853E85EFB0B5
:104B20003FE42A8785476308F70097570300938778
:104B300067C2054798C3825785073ED00257914701
:104B4000E3D5E7FC02D0A5A882572947B317F700A1
:104B50003ED6EFD06F9F2AD497570300938787BE26
:104B60009C43181081463256BA853E85EFB05FDF10
:104B7000AA8799C7975703009387C7BD054798C36E
:104B8000EFD08F9C2A87A257B307F7403ED2125727
:104B9000B2576378F700975703009387A7BB054781
:104BA00098C3B257BD07125763F8E7009757030041
:104BB000938747BA054798C3825785073ED0025767
:104BC0009147E3D3E7F8975703009387E7B823A00B
:104BD000070097570300938727B79C433E85EFC094
:104BE000DFDF21A05145EFC07FA2975703009387D5
:104BF000A7B6984393075005E316F7FE5145EFC05B
:104C0000FFA097570300938727B523A0070002D082
:104C1000C1A0975703009387E7B29C437808814669
:104C20000146BA853E85EFC06F802A8785476308B5
:104C3000F700975703009387E7B1054798C3975745
:104C40000300938727B09C43181081460146BA851C
:104C50003E85EFB0FFD02A8785476308F700975756
:104C60000300938727AF054798C39757030093879F
:104C7000A7AE9843930750056318F70097570300B2
:104C8000938747AD054798C3975703009387C7ABF2
:104C90009C4391453E85EFC0DFAD97570300938756
:104CA000A7AB9843930750056318F7009757030085
:104CB000938747AA054798C3975703009387C7A8C8
:104CC0009C4385453E85EFC0DFAA825785073ED0CD
:104CD00002579147E3DFE7F221A05145EFC01F9350
:104CE00097570300938747A7984393075005E31608
:104CF000F7FE5145EFC09F91975703009387C7A5D3
:104D000023A0070002D015A897570300938787A315
:104D10009C43780881460146BA853E85EFB01FF175
:104D20002A8785476308F70097570300938787A270
:104D3000054798C3825785073ED002579147E3D570
:104D4000E7FC97570300938727A09C433E85EFC05D
:104D5000DFC821A05145EFC07F8B97570300938791
:104D6000A79F984393075005E316F7FE5145EFC000
:104D7000FF89975703009387279E23A0070002D03F
:104D8000C1A0975703009387E79B9C431810814667
:104D90000146BA853E85EFB0BFBC2A8785476308C8
:104DA000F700975703009387E79A054798C39757EB
:104DB0000300938727999C43780881460146BA856A
:104DC0003E85EFB0BFE62A8785476308F70097570F
:104DD000030093872798054798C397570300938745
:104DE000A7979843930750056318F7009757030058
:104DF00093874796054798C3975703009387C794AF
:104E00009C4391453E85EFC0DF96975703009387FB
:104E1000A7949843930750056318F700975703002A
:104E200093874793054798C3975703009387C79184
:104E30009C4385453E85EFC0DF93825785073ED072
:104E400002579147E3DFE7F221A05145EFC00FFC85
:104E50009757030093874790984393075005E316AD
:104E6000F7FE5145EFC08FFA975703009387078EDF
:104E70009C4313871700975703009387278D98C388
:104E800011B1797106D62AC60145EFC0FFA2EFC065
:104E9000BFEB2ACE02CA975703009387E78B13070D
:104EA000500598C3975703009387C7899C435808B8
:104EB00081461306F00ABA853E85EFB07FAAAA871D
:104EC00099C7975703009387E788054798C3EFC0B2
:104ED000BFE72A87F247B307F7403ECC6247930704
:104EE000E00A63E8E700975703009387A786054722
:104EF00098C362479307E00B63F8E70097570300F6
:104F000093874785054798C3975703009387C784BE
:104F10001307500598C30145EFC01F9AEFC0DFE2A9
:104F20002ACE97570300938727831307500598C30A
:104F300097570300938707819C43580881461306BF
:104F4000F00ABA853E85EFB07FCEAA8799C79757FA
:104F5000030093872780054798C3EFC0FFDE2A87A9
:104F6000F247B307F7403ECC62479307E00A63E895
:104F7000E700974703009387E77D054798C362479B
:104F80009307E00B63F8E700974703009387877C5C
:104F9000054798C3974703009387077C130750057D
:104FA00098C3974703009387A77A9C4313871700FA
:104FB000974703009387C77998C3F9B5411185478F
:104FC0003EC6974703009387677898439747030047
:104FD0009387C7789C436313F70002C69747030083
:104FE00093870777984397470300938767779C4396
:104FF0006313F70002C6974703009387A77598438A
:1050000085476313F70002C69747030093874774E9
:105010009843974703009387A77498C39747030063
:105020009387C7729843974703009387277398C362
:10503000B2473E8541018280411106C69305800C2E
:105040001305800CEFB05F8D2A8797470300938785
:10505000A77198C397470300938707711307A00AA6
:10506000D8C3974703009387277023A4070081457F
:105070001305800CEFB05F8A2A8797470300938758
:10508000A76ED8C7974703009387076E23A807002A
:10509000974703009387476D23AA070097470300AC
:1050A0009387876C9C4397B501009385A51D3E852A
:1050B000EFC06F93974703009387076BDC4797B563
:1050C00001009385251D3E85EFC0EF9197470300B2
:1050D000938787699C4399E7974703009387C7683D
:1050E000DC47A9CB81480148814701479746030027
:1050F000938686671306004097B501009385851A4D
:10510000170500001305C515EFC02F9D8148014804
:1051100081470147974603009386C6651306004002
:1051200097B50100938585181705000013054513F1
:10513000EFC0AF9A0100B24041018280797106D67A
:105140002AC62EC48146014681453245EFB05F81B3
:105150002A8785476318F70097470300938787607E
:10516000054798C302CE15A88146014681453245C0
:10517000EFB0DFAB2A8785476308F7009747030046
:105180009387475E054798C3A2479C431387170040
:10519000A24798C3F24785073ECE72479307700C2B
:1051A000E3F4E7FC8146014681453245EFB01FA894
:1051B0002A8785476318F700974703009387875A24
:1051C000054798C30100B25045618280797106D6C7
:1051D0002AC62EC48146014681453245EFB01FA53F
:1051E0002A8785476318F7009747030093878757F7
:1051F000054798C302CE15A8814601468145324530
:10520000EFB00FF62A8785476308F700974703003A
:1052100093874755054798C3A2479C4313871700B8
:10522000A24798C3F24785073ECE72479307700C9A
:10523000E3F4E7FC8146014681453245EFB04FF289
:105240002A8785476318F70097470300938787519C
:10525000054798C30100B25045618280797106D636
:105260002AC6B2473ECEF247D8439307A00A631935
:10527000F700F2479843F247A107BE853A857D3D86
:10528000F2479C438146014681453E85EFB01F9A17
:105290002A8785476318F700974703009387874C51
:1052A000054798C3F2479843F247A107BE853A8560
:1052B000313FF2479843F247A107BE853A85BD3D8D
:1052C000D5B7411185473EC6974703009387874965
:1052D0009C4391C302C6974703009387E7489847CA
:1052E000974703009387C7499C436314F70002C69E
:1052F00019A89747030093872747984797470300C4
:105300009387074898C3974703009387E745D84B8F
:1053100097470300938707479C436314F70002C62F
:1053200019A89747030093872744D84B9747030052
:105330009387474598C3B2473E854101828041111A
:1053400006C61145EFB0EFC92A8797470300938738
:10535000A74398C397470300938707439C4397B598
:105360000100938525F53E85EFB0FFE797470300E1
:10537000938787419C43B5CB8148014897470300F9
:1053800093874742094781461306004097B50100BD
:10539000938545F3170500001305E505EFB0FFF30E
:1053A0008148014897470300938707400547814696
:1053B0001306004097B50100938545F117050000DD
:1053C00013056513EFB07FF181480148814701471C
:1053D00081461306004097B501009385A5EF170598
:1053E00000001305451EEFB05FEF0100B240410120
:1053F0008280797106D62AC6974703009387C738FB
:105400009C433E85EFB0CFC52A8785476318F700D8
:105410009747030093878737054798C302CE15A89F
:1054200097470300938747369C43A1453E85EFB0DD
:105430006FC82A8785476308F7009747030093875B
:10544000E734054798C35145EFC04F9CF2478507A5
:105450003ECE7247A547E3F5E7FC02CE0DA85145C5
:10546000EFC0CF9A97470300938707329C433E854E
:10547000EFB00FBF2A8785476308F70097470300FF
:105480009387C730054798C3F24785073ECE7247DA
:10549000A547E3F6E7FC974703009387E72E9C4375
:1054A0003E85EFB0EFBB2A8785476318F700974723
:1054B00003009387A72D054798C397470300938759
:1054C000A72D9C4313871700974703009387C72C8A
:1054D00098C3974703009387A72B054798C30145B7
:1054E000EFC08FBD974703009387872A23A007004B
:1054F00021B7011106CE2AC6974703009387C72814
:105500009C43F9553E85EFB0EFBA2A878547631370
:10551000F706974703009387A727984385476309B2
:10552000F7009747030093876726054798C389A824
:1055300097470300938747259C433E85EFB04FB2C2
:105540002A8785476308F700974703009387072456
:10555000054798C3974703009387C723054798C318
:105560000145EFC06FB5974703009387A72223A09B
:10557000070039A09747030093874721054798C341
:1055800097470300938787219C431387170097470A
:105590000300938767209C436308F7009747030045
:1055A0009387C71E054798C3974703009387071F34
:1055B0009C4313871700974703009387271E98C3C0
:1055C00025BF011106CE2AC6974703009387C71B44
:1055D0009C4381453E85EFB0EFAD2A878547E315B3
:1055E000F7FE974703009387E71B9C433E85EFC078
:1055F000AF872A878D476305F7007370043001A0D9
:10560000974703009387471A9C433E85EFC0CF8599
:105610002A878D476305F7007370043001A0974710
:1056200003009387271798438547631AF700974726
:1056300003009387E715984385476309F700974769
:1056400003009387A714054798C3F5A09747030065
:10565000938707159C431387170097470300938789
:10566000271498C397470300938707149C433E85EC
:10567000EFC0AFB6974703009387C7129C433E85A0
:10568000EFC0AFB5974703009387C710984385478E
:10569000630AF700974703009387870F984385476E
:1056A0006318F700974703009387470E054798C391
:1056B0000145EFC04F852A8789476305F70073705E
:1056C000043001A0974703009387C70D9C433E8594
:1056D000EFB09FF92A8789476305F700737004309C
:1056E00001A0974703009387270C9C433E85EFB0AA
:1056F000BFF72A8789476305F7007370043001A05C
:1057000097470300938747089C433E85EFB04F952A
:105710002A8785476308F7009747030093870707A1
:10572000054798C30145EFB01FFEAA87E38E07E83F
:105730007370043001A049BD41119747030093875E
:10574000E706984397470300938707059C4363192F
:10575000F7009747030093876703054798C319A885
:10576000974703009387470398439747030093871E
:10577000E70398C3974703009387870398439747A6
:1057800003009387A7019C436319F7009747030021
:105790009387C7FF054798C319A8974703009387C6
:1057A000E7FF9843974703009387870098C397477D
:1057B000030093872700984397470300938747FE8A
:1057C0009C436319F70097470300938727FC05471D
:1057D00098C319A897470300938787FC9843974776
:1057E0000300938727FD98C397470300938707FA21
:1057F000984385476314F70002C619A085473EC643
:10580000B2473E8541018280B305B500930705008C
:105810006386B70003C70700631607003385A740F8
:1058200067800000938717006FF09FFE130101FD52
:1058300023229102232A51012326110223248102CB

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -12,7 +12,7 @@
:1000A000A57701461122170502001305254897057B
:1000B00002009385A5530146C52817A50300130523
:1000C000E57597B503009385257537B6ABAB130679
:1000D000B6BAD92817B1030013014174EF60E05894
:1000D000B6BAD92817B1030013014174EF608059F3
:1000E000860293D21200F512638802008242110147
:1000F0006F00001073002030824211017300203025
:10010000711116C0F3222034E3CC02FC82421101AB
@ -49,7 +49,7 @@
:1002F000220523A4320523A6420523A8520523AADA
:10030000620523AC720523AE820523A0920723A2C7
:10031000A20723A4B20723A6C20723A8D20723AAB1
:10032000E20723ACF207EF40302E17010200032151
:10032000E20723ACF207EF40702E17010200032111
:1003300021230241F65273901234B72200009382B7
:10034000028873A0023082403242C2425243E243EA
:10035000724482541255A2553256C2565257E25731
@ -639,7 +639,7 @@
:1027D00023A607D617E70100130787D81C43B7A61F
:1027E000A5A59386565A9C5B8C43639BD500D0432A
:1027F0006318B60094476395C600DC476388D7002A
:1028000008430C4393854503EF20C07F97E6010002
:1028000008430C4393854503EF20700097E60100D1
:10281000938686D3904217E70100130767E611A855
:102820009C42B9CB9C42FD1717E60100232EF6D03F
:10283000904293172600B2978A07BA979C43EDD32C
@ -975,7 +975,7 @@
:103CD0008280411122C42A8406C6EFC00FFF004033
:103CE000EFC04FFEB240228522444101828009C9C3
:103CF000370700FFB3F7E50099C77370043001A0E0
:103D00007370043001A06F20700DB70700FFF18FB2
:103D00007370043001A06F20100EB70700FFF18F11
:103D100081C77370043001A001E67370043001A004
:103D2000011122CC4AC84EC652C406CE26CA3689D4
:103D3000AE892A8A3284EFF0CF8C21E16305090035
@ -996,7 +996,7 @@
:103E20000002EFE03FE55C40E5FB2285612A224489
:103E3000B240924441016FE0CF9B7370043001A007
:103E400009C9370700FFB3F7E50099C7737004305D
:103E500001A07370043001A06F20407801C9B7073A
:103E500001A07370043001A06F20E07801C9B7079A
:103E600000FFED8F99C77370043001A073700430A8
:103E700001A0411122C426C206C62A84AE84EFF0F6
:103E80000F8D184093C7F4FFF98F1CC02244B24035
@ -1008,7 +1008,7 @@
:103EE00001009387676917D701002325F788854765
:103EF00017C701002328076817C70100232E07668C
:103F000017C701002328F76619E8EFE08F8EEF103E
:103F1000E00E01442285B240224441018280130513
:103F1000800F01442285B240224441018280130572
:103F2000840093773500C1EFE5671307F5FFE917C4
:103F3000E3EDE7FC97C60100938686649C4229A0C6
:103F4000984311C7BE86BA87D843E36BA7FE17C74D
@ -1088,9 +1088,9 @@
:1043E00071618280A14C02C4854763D50715B2472D
:1043F0008040938B770093F68BFF03AB060083A975
:104400004600938786003EC6668681465A85CE85DD
:10441000EF1090672AC8814763853723930D4101C8
:10442000854B668681465A85CE85EF1010308146D1
:1044300066862A8BAE89EF103065A24723A0AD00B7
:10441000EF1030682AC8814763853723930D410127
:10442000854B668681465A85CE85EF10B030814631
:1044300066862A8BAE89EF10D065A24723A0AD0017
:1044400093861B00910D63843701B68BD9BFE37E41
:104450009BFF63DD4601A2872380A70180407D1A70
:10446000930714009CC03E84E3C846FF93962B003C
@ -1125,7 +1125,7 @@
:10463000E1BB03C616000508CA8681BB9C404689BB
:1046400021B7E37D9BDD8547814B8546E3C547E187
:1046500031BD97CC0100938CECD6CE856685EF10EA
:10466000A052330AAA40635C400180402300A401A9
:104660004053330AAA40635C400180402300A40108
:1046700080407D1A050480C0E31A0AFE014A83C700
:104680000C00E38207EAE3C809E6FD197D57E394CD
:10469000E9E6ADBDB247938647009C4336C693D941
@ -1153,9 +1153,9 @@
:1047F0000112832DC11171618280A14C014D854749
:1048000063DB0719A2479D07E19B83AD070003AB5C
:104810004700138787003AC4668681466E85DA852D
:10482000EF1090262AC863066D35130941018549AA
:10483000668681466E85DA85EF10206F6686814632
:10484000AA8D2E8BEF1050242320A9008509110971
:10482000EF1030272AC863066D3513094101854909
:10483000668681466E85DA85EF10C06F6686814692
:10484000AA8D2E8BEF10F0242320A90085091109D1
:10485000E3106DFFE3FE9DFD13060004B70610F0A4
:1048600063D189031C4013871700D69797C50100B1
:1048700023ACE5D023807701630CC7047D1CE3C320
@ -1222,7 +1222,7 @@
:104C40007D1BE31A1BF5A5BF17570300130787B396
:104C5000B70610F005078347F7FF23A0F6F01C40C6
:104C6000FD1717C601002321F692EDF74AC45DBC7B
:104C700097BC0100938C0C75DA856685EF00D070C7
:104C700097BC0100938C0C75DA856685EF00707126
:104C8000330CAC40E35C80EF1C4013060004B70615
:104C900010F021A07D1CE3020CEE13871700D697BD
:104CA0002380770197C5010023A0E58EBA87E3131F
@ -1246,403 +1246,404 @@
:104DC000BAC0C2C4C6C61ACEEFF04FD4B2472380D1
:104DD00007003245B250018D225461618280B707CD
:104DE00010F083A647F403A607F403A747F4E31AD9
:104DF000D7FE9306067D33B6C600B305E60023A4AE
:104E0000D7F423A6B7F48280B70710F003A747F4BE
:104E100003A607F483A647F4E31AD7FE9306067D9C
:104E200033B6C60023A4D7F4B305E60023A6B7F42F
:104E30009307000873A047308280797122D406D688
:104E400026D24AD04ECE52CC56CA5AC85EC697B762
:104E500001009387E77317B4010013042473984388
:104E60001C40930647069387470617B60100232F79
:104E7000F670856717B60100232CD670938777BB31
:104E800063CDD700B250225492540259F249624A7B
:104E9000D24A424BB24B45618280FD779387C74A25
:104EA0003E9797B7010023A5E76E75238547631CDE
:104EB000F504EF00B0078549114B814BA144314AFD
:104EC000814A2A896302350717B501001305455247
:104ED000553DEF00F03DD2846306350717B501005C
:104EE00013058553EFF01FEA2685EFF01FE92254E2
:104EF000B25092540259F249624AD24A424BB24BE2
:104F000045616FC01FE917B501001305254CEFF08F
:104F10007FE7EF00B0018549194B894BA944394A15
:104F2000894A2A89E31235FBEF009038E31825FB04
:104F3000639C0A0018408967938777328144E3C5F0
:104F4000E7FA89B7DA844DB7DE8479BF17B5010077
:104F50001305C54E6FF01FE317B501001305854E0D
:104F60006FF05FE2411122C426C206C6856417B401
:104F700001001304A44D938784380100FD17F5FF49
:104F80002285EFF03FE0C5BF411106C6A929D12512
:104F9000B24041016F007027411106C622C426C2EB
:104FA0005D2985476313F50491440144EF000078BF
:104FB00085476309F50017B5010013056543EFF058
:104FC0007FDC2684EF00D02E8547630AF50017B5F5
:104FD000010013056544EFF0FFDA136484002285B5
:104FE000B240224492444101828017B5010013056A
:104FF000E53DEFF03FD9994409444DBF737004304B
:1050000001A082807370043001A0797126D24AD049
:105010004ECE52CC56CA5AC806D622D417BA010070
:10502000130A0A5917BB0100130BCB579304500501
:1050300005499309E00A930AE00B0145EFD01F856B
:10504000EFC03FD72A8403250A0081461306F00AE1
:105050006C0002C697B7010023A29754EFB0AFF2DD
:1050600009C597B7010023AD2753EFC09FD4018D29
:1050700063F4A90063F6AA0097B7010023A227539F
:10508000014597B7010023AB9750EFD03F80EFC0A9
:105090005FD22A8403250A0081461306F00A6C00B9
:1050A00097B7010023AC974EEFB01FBE09C597B765
:1050B000010023A7274FEFC0DFCF018D63F4A900C4
:1050C00063F6AA0097B7010023AC274D97B70100FC
:1050D00023A6974C83270B00850717B701002323CE
:1050E000F74CA1BF397126DA4AD84ED652D456D2DF
:1050F0005AD05ECE62CC66CA06DE22DC6AC817BA17
:105100000100130AEA4A17B901001309294997BB9C
:105110000100938BAB4997BC0100938CEC48294C60
:10512000054B914A85499304500502C40146331446
:10513000CC00EFC01FC82A8D03250A0081462286B5
:105140006C00EFB07FB409C597B7010023AA3745BB
:10515000EFC03FC63305A5419307F4006376850091
:1051600017B70100232E374363FDA724224697B7C4
:10517000010023A73743050632C4E3DACAFA02C4A2
:1051800003250A00814601462C00EFB0CFDF6306FD
:10519000652597B7010023A53741A24785073EC47F
:1051A000E3D0FAFE02C401463314CC00EFC07FC046
:1051B0002A8D03250A00814622862C00EFB0AFDC41
:1051C00009C597B7010023AD373DEFC09FBE33053A
:1051D000A5419307F4006376850017B701002321EA
:1051E000373D63FAA71C224697B7010023AA373B35
:1051F000050632C4E3DACAFA03A50B0097B701002B
:1052000023AE0738EFC06FFA832709006389970040
:105210005145EFC07FFC83270900E39B97FE514572
:10522000EFC09FFB97B7010023AA073602C40325EE
:105230000A00814601466C00EFB01FA58146014679
:105240002C006306650197B7010023AB37350325B2
:105250000A00EFB04FD391456306650197B701008F
:1052600023A037358327090003A50B006396970019
:1052700097B7010023A63733EFC02FE1832709003A
:10528000854503A50B006396970097B7010023A9F6
:105290003731EFC08FDFA24785073EC4E3D9FAF864
:1052A00083270900514563899700EFC0FFF28327E8
:1052B00009005145E39B97FEEFC01FF297B701002D
:1052C00023AE072C02C403250A00814601466C0068
:1052D000EFB09F9B630D650F97B7010023A2372D99
:1052E000A24785073EC4E3D0FAFE03A50B00EFC03A
:1052F000CFEB83270900638997005145EFC0DFEDAD
:1053000083270900E39B97FE5145EFC0FFEC97B759
:10531000010023A5072802C403250A00814601468F
:105320002C00EFB04FC6814601466C006306650154
:1053300097B7010023A6372703250A00EFB0DF94B3
:1053400091456306650197B7010023AB3725832795
:10535000090003A50B006396970097B7010023A1EE
:105360003725EFC08FD283270900854503A50B00A1
:105370006396970097B7010023A43723EFC0EFD0BF
:10538000A24785073EC4E3D9FAF8832709005145AF
:1053900063899700EFC05FE4832709005145E39BD1
:1053A00097FEEFC07FE383A70C00850717B70100C6
:1053B000232CF71E9DBB2246050632C4E3D6CADE67
:1053C00025BD2246050632C4E3D3CAD64DBBA2474B
:1053D00085073EC4E3D9FAEE09BFA24785073EC45C
:1053E000E3D0FADAC1B3411101469145154506C62D
:1053F000EFB0CFAC97B501009385850697B7010054
:1054000023A8A71AEFB0BFCD8148014881470947BB
:1054100081461306004097B501009385A505170541
:105420000000130565CCEFB0FFEBB24081480148A6
:1054300097B70100938787170547814613060040F9
:1054400097B501009385850317050000130525BC5A
:1054500041016FB03FE917B701001307E71497B692
:1054600001009386261417B601001306A6121C43EA
:1054700010428C4217B501001305051203280500E0
:1054800001456386C500B38707413335F00097B700
:1054900001009387E7109C4394421843FD17B337EC
:1054A000F000B307F04017B601002325D60E7D8D1E
:1054B00097B6010023A2E60E8280011122CC06CE0F
:1054C00026CA4AC84EC652C458419307A00A2A8425
:1054D00004416309F7108146014681452685EFB0F6
:1054E000AFFA85476316F50097B7010023A8A70C0C
:1054F00005498549032A04008146014681455285B4
:10550000EFB08FF86304250B9304800C81460146AD
:1055100081455285EFB02FA71C446300250D8507F8
:1055200017B70100232C3709FD141CC4E5F0814690
:10553000014681455285EFB00FA56316250197B747
:10554000010023AD2707032A040081460146814557
:105550005285EFB04FA3630025079304800C81466A
:10556000014681455285EFB02FF21C44630A2505A0
:10557000850717B7010023233705FD141CC4E5F088
:105580008146014681455285EFB00FF0E31425F7BF
:10559000032A0400814601468145528597B70100E0
:1055A00023AE2701EFB04FEEE31025F797B70100C8
:1055B00023A6270191BF97B7010023A1270171BF3F
:1055C0008507FD141CC4C1FC8146014681455285F6
:1055D000EFB08FEBE31025F365BF8507FD141CC406
:1055E00095F4B1B78146014681452685EFB0AF9964
:1055F00085476316F50097B7010023A1A7FC13099F
:10560000800C85498146014681452685EFB0CFE76C
:105610001C44630A3503850717B70100232037FBB5
:105620007D191CC4E31009FE26858146014681458B
:10563000EFB08FE585470440E31FF5E897B7010019
:1056400023AEA7F649BD85077D191CC4E31C09FAE2
:10565000E1BF41119305800C1305800C06C622C4DE
:10566000EFB04F8F9747030023AEA7149307A00A0C
:1056700017470300232AF71481451305800C974729
:10568000030023A50714EFB0EF8C9747030023A175
:10569000A7149747030023AF07121744030013040E
:1056A00064129747030023A90712084097B5010029
:1056B000938545DDEFB0BFA2484497B501009385BF
:1056C00065DDEFB0DFA11C40A1CF814801488147D3
:1056D0000147974603009386E60E1306004097B5F0
:1056E0000100938525DC17050000130545DDEFB0AB
:1056F0007FBF2244B2408148014881470147974615
:1057000003009386E60C1306004097B501009385CD
:10571000E5D917050000130585DA41016FB09FBC7C
:105720005C44C5F7B24022444101828017B70100B2
:105730001307C7E81043974703009387A70817B7D5
:105740000100130767E71843944701456389E600A2
:1057500098471335160097B6010023AFE6E417B754
:105760000100130727E5D44B18436388E600DC4BA0
:1057700017B701002320F7E4828001458280797108
:1057800022D426D24AD04ECE52CC56CA5AC85EC671
:1057900062C406D697B40100938444E597B901002A
:1057A000938909E317BA0100130A4AE297BA010084
:1057B000938A0AE397BB0100938BCBE217BC0100ED
:1057C000130C4CE105440D49094B88408145EFB06D
:1057D000AFECE31C85FE03A50900EFB09FF8631C46
:1057E000250B03250A00EFB0DFF76313250B83A712
:1057F0000A006387870097B7010023A787DEF1B708
:1058000083A70B00E39987FE83270C0003250A007A
:10581000850717B70100232FF7DAEFC00F9903A50B
:105820000900EFC08F9883A70A006387870483A7C6
:105830000B00638387040145EFB0FFFC6317650528
:1058400003A50900EFB0FFF1631D650503250A00FC
:10585000EFB03FF1631465058840EFB0AFA3630676
:10586000850097B7010023A187D80145EFB0BFF9A4
:1058700029DD7370043001A0014597B7010023A50D
:1058800087D6EFB05FF8E30D65FB7370043001A0BD
:105890007370043001A07370043001A07370043081
:1058A00001A07370043001A0011122CC26CA4AC89D
:1058B0004EC652C406CE17B90100130929D317BA30
:1058C0000100130A2AD297B401009384E4D097B957
:1058D00001009389A9D005442DA097B7010023A505
:1058E00087D09C4003A7090085076386E70097B728
:1058F000010023AB87CE9C40850717B70100232DFD
:10590000F7CC03250900F955EFB00FD9E31785FC53
:1059100083270A00E39387FC03250900EFB08F97E4
:105920006306850097B7010023A087CC014597B790
:10593000010023A787CAEFC07FF597B7010023A115
:1059400007CA45B701114AC817B90100130909CAA6
:105950000325090022CC4EC606CE26CA054497B9B7
:1059600001009389A9C7EFB0EF9263058508A944A8
:1059700003250900A145EFB02FD263028508FD146D
:10598000514597B7010023A187C6EFC0FF84EDF012
:10599000A9445145EFC05F8403250900FD14EFB011
:1059A0006F8F6306850097B7010023AF87C2F5F0BC
:1059B00003250900EFB00F8E6316850097B701002D
:1059C00023A487C283A709000145850717B70100F3
:1059D0002326F7C097B7010023A687C0EFC01FEBAF
:1059E0000325090097B7010023AE07BEEFB08F8AE9
:1059F000E31F85F697B7010023A887BE8DBFFD146E
:105A00005145EFC06FFDADF461B74111114506C6B8
:105A1000EFB08F8297B501009385C5A997B70100B4
:105A200023A6A7BCEFB0AFEB97B70100938707BCE5
:105A30009C43A5CF8148014897B70100938747B998
:105A4000094781461306004097B50100938585A755
:105A500017050000130545EFEFB0DF8881480148C6
:105A600097B70100938787B6054781461306004024
:105A700097B50100938585A517050000130505E37B
:105A8000EFB05F86B24081480148814701478146B7
:105A90001306004097B501009385C5A317050000C4
:105AA000130525CE41016FB0FF83B24041018280D2
:105AB00097B70100938787B297B601009386C6B067
:105AC000984394426382E6069C4397B6010093860E
:105AD00066AF944217B701002328F7AE97B70100CD
:105AE000938787AF98436382E6069C4397B601008D
:105AF000938606AD944217B701002325F7AC97B7FC
:105B00000100938727AD98436382E6069C4317B74D
:105B100001002327F7AA97B701009387E7AC8843D2
:105B20007D153335A0008280854717B70100232DEE
:105B3000F7AA97B601009386E6A897B70100938766
:105B4000A7A998439442E392E6FA854717B7010064
:105B5000232CF7A897B60100938686A697B7010075
:105B6000938747A798439442E392E6FA854717B78D
:105B70000100232BF7A697B701009387E7A6884378
:105B80007D153335A0008280AA95AA876385B7006A
:105B900003C7070001E73385A74082808507FDB76B
:105BA000814863DA05003305A040B337A000B30590
:105BB000B0409D8DFD5863D906003306C040B33711
:105BC000C000B306D0409D8E32883683AA872E87C8
:105BD000639F061C97A601009386C66D63F1C50CF2
:105BE000416E6377C60B130EF00F6373CE00214333
:105BF000335E6600F29603CE06001A9E130300027F
:105C00003303C341630C0300B3956500335EC501E4
:105C1000331866003367BE00B3176500135E0801D2
:105C2000B355C70313150801418193D60701337695
:105C3000C703B305B5024206D18E63F8B600C2961B
:105C400063E5060163F3B600C2968D8E33F7C60393
:105C5000C207C183B3D6C603B306D5021315070125
:105C6000C98F63F8D700C29763E5070163F3D700D4
:105C7000C297958F33D567008145638A0800B307C3
:105C8000A0403337F000B305B0403E85998D828047
:105C9000370E00014143E36DC6F5614391BF01E654
:105CA00005483358680241676373E8081307F00F2B
:105CB00063730701214333576800BA9603C6060091
:105CC0001A96130300023303C34063190306B38516
:105CD00005419356080113150801418113D60701A8
:105CE00033F7D502B3D5D5024207518FB305B502BC
:105CF0006378B7004297636507016373B700429703
:105D0000B305B74033F7D502C207C183B3D5D50277
:105D1000B305B50213150701C98F63F8B700C29721
:105D200063E5070163F3B700C2978D8FA1B737070B
:105D300000014143E361E8F86143B5BF33186800EF
:105D400033DEC500935E08013356C500B317650006
:105D50003355DE03B39565004D8E93150801C1815F
:105D6000935606013377DE033385A5024207558F2C
:105D70006378A7004297636507016373A7004297A2
:105D8000B306A74033F7D60342064182B3D6D60303
:105D90004207B386D502B365C70063F8D500C29544
:105DA00063E5050163F3D500C295958D1DB7E3E664
:105DB000D5EC416863F50605930EF00F33B8DE00AD
:105DC0000E0833DE060117A301001303A34E7293DE
:105DD000834E0300130E0002C29E330EDE41631792
:105DE0000E0263E4B6006369C500B307C540958D34
:105DF0003335F5003387A5403E85BA85BDBD3703F1
:105E000000014148E3EF66FA614865BF3357D601A8
:105E1000B396C601D98EB357D50133D7D501B39503
:105E2000C501CD8F93D506013373B702139F0601C9
:105E3000135F0F0113D807013316C6013315C501CF
:105E40003357B702420333680301B30FEF023A83BB
:105E5000637CF80136981303F7FF6367D800637516
:105E6000F8011303E7FF36983308F841B37FB8020F
:105E70003358B802C20FB3050F03139F0701135F16
:105E80000F0133EFEF014287637CBF00369F13079A
:105E9000F8FF6367DF006375BF001307E8FF369FF5
:105EA0004203C16F3363E3009387FFFF135806017A
:105EB000330FBF40B375F30013530301F18F3387E2
:105EC000F502B307F302B385050333030303BE955D
:105ED000135807012E986373F8007E93C167FD176E
:105EE000935508013378F80042087D8F9A954297C0
:105EF0006366BF00631BBF006379E5003306C740DC
:105F00003337C700958D998D32873307E540333598
:105F1000E500B305BF40898DB397D5013357C7015D
:105F200033E5E700B3D5C50189BBAE873288368734
:105F30002A836396062097A801009388A83763FEFA
:105F4000C50A41676374E60A1307F00F3337C700C9
:105F50000E07B356E600B69883C608003697930638
:105F60000002998E99CAB397D7003357E5003318CA
:105F7000D600B365F7003313D50013550801B3D726
:105F8000A5021316080141829356030133F7A502B7
:105F9000B305F6024207D98E3E8763FCB600C2966F
:105FA0001387F7FF63E7060163F5B6001387E7FF82
:105FB000C2968D8EB3F7A602420313530301B3D6E4
:105FC000A602C20733E36700B305D6023685637BBA
:105FD000B30042931385F6FF636603016374B30055
:105FE0001385E6FF4207498F81454DA8B70600019A
:105FF0004147E360D6F66147A9BF01E6854633D83D
:10600000C602C166637ED8089306F00F63F30601EB
:106010002147B356E800B69883C60800BA9613071E
:106020000002158F49E7B3870741854513560801DC
:106030009318080193D808019356030133F7C70258
:10604000B3D7C7024207D98E3385F8023E8763FC77
:10605000A600C2961387F7FF63E7060163F5A60063
:106060001387E7FFC296898EB3F7C6024203135324
:106070000301B3D6C602C20733E36700B388D80270
:106080003685637B130142931385F6FF6366030134
:10609000637413011385E6FF4207498F3A858280B6
:1060A000B70600014147E366D8F661479DB733184C
:1060B000E800B3D5D7003313E500B356D500135528
:1060C0000801B397E70033F7A502B3E8F60093178A
:1060D0000801C18313D60801B3D5A5024207518F29
:1060E000B386B7022E86637CD70042971386F5FFEE
:1060F000636707016375D7001386E5FF4297B30610
:10610000D74033F7A602C20893D80801B3D6A60237
:106110004207B385D702B3671701368763FCB70020
:10612000C2971387F6FF63E7070163F5B70013878C
:10613000E6FFC2978D8F93150601D98DC5BD63E229
:10614000D514416763FEE6021308F00F3337D80019
:106150000E0733D8E60097A501009385A515C295D3
:1061600003C80500930500023A98B385054185E10F
:106170000547E3E5F6F23335C5001347150039BF8F
:10618000B70500014147E3E6B6FC6147D9B733578D
:106190000601B396B600D98E93DE060133D7070108
:1061A000B378D703B397B700335805013363F800CA
:1061B00093970601C183135803013316B600335772
:1061C000D703C20833E80801338FE7023A8E637CB5
:1061D000E8013698130EF7FF6367D8006375E8018E
:1061E000130EE7FF36983308E841B378D8033358E5
:1061F000D803C208B38E070393170301C183B3E723
:10620000F800428763FCD701B6971307F8FF63E7EE
:10621000D70063F5D7011307E8FFB697420EB3879F
:10622000D741C16E3367EE001388FEFF3373070159
:1062300093580701337806014182330E03033388F4
:10624000080393560E013303C30242939A96B38810
:10625000C80263F30601F69813D60601B29863E00C
:106260001703E39317D9C167FD17FD8EC206337E6E
:10627000FE003315B500F2968145E371D5E27D1736
:10628000A5B38145014719BDB2883687AA872E88F4
:106290006398061C97A601009386C60163F8C50A99
:1062A0004163637E66081303F00F6373C3002147E5
:1062B0003353E6009A9603CE0600130300023A9E7B
:1062C0003303C341630C0300B3956500335EC5011E
:1062D000B31866003368BE00B317650013D6080113
:1062E0003377C80213950801418193D607013358CB
:1062F000C8024207D98E3308050363F80601C69623
:1063000063E5160163F30601C696B386064133F7CB
:10631000C602C207C183B3D6C602B306D50213159F
:106320000701C98F63F8D700C69763E5170163F3C8
:10633000D700C697958F33D5670081458280370394
:1063400000014147E36666F661479DB701E60546F1
:10635000B3581603416663F3C8081306F00F63735E
:106360001601214733D6E800B29603CE0600130388
:1063700000023A9E3303C34163190306B3851541F6
:1063800013D7080113950801418113D60701B3F60D
:10639000E502B3D5E502C206D18EB305B50263F8B6
:1063A000B600C69663E5160163F3B600C696B385DC
:1063B000B640B3F6E502C207C183B3D5E502B30523
:1063C000B50213950601C98F63F8B700C69763E558
:1063D000170163F3B700C6978D8FB1BF3706000171
:1063E0004147E3E1C8F86147B5BFB398680033D7C8
:1063F000C501B3176500335EC50113D50801B37637
:10640000A702B3956500336EBE0093950801C18164
:1064100013560E013357A702C206D18E3387E50209
:1064200063F8E600C69663E5160163F3E600C696D8
:106430003386E640B376A602420E135E0E01335653
:10644000A602C2063386C502B3E5C60163F8C500DD
:10645000C69563E5150163F3C500C695918D0DB72B
:10646000E3EED5EC416763F5E604930EF00F33B726
:10647000DE000E0733D3E60097A80100938888E377
:106480009A9883CE0800130E0002BA9E330EDE41A6
:1064900063170E0263E4B6006369C500B307C54025
:1064A000958D3335F5003388A5403E85C28579B595
:1064B000B70800014147E3EF16FB614765BF33575B
:1064C000D601B396C601D98EB357D50133D7D501BE
:1064D000B395C501CD8F93D506013373B702139FD2
:1064E0000601135F0F0193D807013316C601331558
:1064F000C5013357B7024203B36813013308EF02F3
:106500003A8363FC0801B6981303F7FF63E7D800EA
:1065100063F508011303E7FFB698B3880841B3FF9A
:10652000B802B3D8B802C20FB3051F03139F070107
:10653000135F0F0133EFEF014687637CBF00369F87
:106540001387F8FF6367DF006375BF001387E8FFF9
:10655000369F4203C1683363E3009387F8FF135803
:106560000601330FBF40B375F30013530301F18FDE
:106570003387F502B307F302B3850503330303033F
:10658000BE95135807012E986373F8004693C167B0
:10659000FD17935508013378F80042087D8F9A95CE
:1065A00042976366BF00631BBF006379E500330653
:1065B000C7403337C700958D998D32873307E54043
:1065C0003335E500B305BF40898DB397D501335707
:1065D000C70133E5E700B3D5C5018DB3011122CC66
:1065E00026CA2A84AE844AC84EC652C456C206CEB3
:1065F000EFB02FFB1C4003290401B7090001B3E5EC
:106600009700930AC4000CC08144FD19370A0002A8
:106610001840638C2A03032609004A85B3654701A5
:10662000B376360193175600758F0329490063C46A
:10663000070001E7F1BFE39DE6FC9317760063D303
:106640000700D58CEFC00FE3E1B793C4F4FFF98CDA
:1066500004C0EFB01F9A0840F2406244D24442495D
:10666000B249224A924A05618280411106C622C47B
:10667000EFE07FD7EFE0FFFDEFF02FB917E7FFFF67
:106680001307E77B814605469305400617A50100E1
:10669000130545DCEFD00FB219C92A84EFB06FF1B2
:1066A0002A860147814685452285EFD04FBDEFB050
:0C66B0002FC8B240224401454101828005
:104DF000D7FE856693868638B29633B6C600B3056D
:104E0000E60023A4D7F423A6B7F48280B70710F0F6
:104E100003A747F403A607F483A647F4E31AD7FED3
:104E2000856693868638B29633B6C60023A4D7F437
:104E3000B305E60023A6B7F49307000873A0473034
:104E40008280797122D406D626D24AD04ECE52CC58
:104E500056CA5AC85EC697B701009387677317B4DE
:104E600001001304A47298431C40930647069387DD
:104E7000470617B60100232BF670856717B60100A9
:104E80002328D670938777BB63CDD700B2502254C6
:104E900092540259F249624AD24A424BB24B45619E
:104EA0008280FD779387C74A3E9797B7010023A179
:104EB000E76E7D238547631DF504EF00D007854924
:104EC000114B814BA144314A814A2A89630335073A
:104ED00017B501001305C551EFF0DFEAEF00F03D13
:104EE000D2846306350717B501001305E552EFF0CC
:104EF0007FE92685EFF07FE82254B25092540259A0
:104F0000F249624AD24A424BB24B45616FC07FE8D8
:104F100017B501001305854BEFF0DFE6EF00B00198
:104F20008549194B894BA944394A894A2A89E31191
:104F300035FBEF009038E31825FB639C0A0018400E
:104F40008967938777328144E3C5E7FA81B7DA84CA
:104F50004DB7DE8479BF17B501001305254E6FF0FC
:104F60007FE217B501001305E54D6FF0BFE1411178
:104F700022C426C206C6856417B401001304044D7A
:104F8000938784380100FD17F5FF2285EFF09FDF3E
:104F9000C5BF411106C6A929D125B24041016F0004
:104FA0007027411106C622C426C25D2985476313B6
:104FB000F50491440144EF00007885476309F5004A
:104FC00017B501001305C542EFF0DFDB2684EF00C3
:104FD000D02E8547630AF50017B501001305C543B8
:104FE000EFF05FDA136484002285B24022449244D9
:104FF0004101828017B501001305453DEFF09FD8B0
:10500000994409444DBF7370043001A082807370CD
:10501000043001A0797126D24AD04ECE52CC56CA65
:105020005AC806D622D417BA0100130A6A5817BB09
:105030000100130B2B579304500505499309E00A0F
:10504000930AE00B0145EFD07F84EFC09FD62A84FE
:1050500003250A0081461306F00A6C0002C697B7C2
:10506000010023AD9752EFB00FF209C597B70100C9
:1050700023A82753EFC0FFD3018D63F4A90063F683
:10508000AA0097B7010023AD2751014597B701004A
:1050900023A69750EFD08FFFEFC0BFD12A840325FE
:1050A0000A0081461306F00A6C0097B7010023A797
:1050B000974EEFB07FBD09C597B7010023A2274FD8
:1050C000EFC03FCF018D63F4A90063F6AA0097B744
:1050D000010023A7274D97B7010023A1974C8327F1
:1050E0000B00850717B70100232EF74AA1BF3971BE
:1050F00026DA4AD84ED652D456D25AD05ECE62CC98
:1051000066CA06DE22DC6AC817BA0100130A4A4AD8
:1051100017B901001309894897BB0100938B0B490C
:1051200097BC0100938C4C48294C054B914A85490A
:105130009304500502C401463314CC00EFC07FC76E
:105140002A8D03250A00814622866C00EFB0DFB36A
:1051500009C597B7010023A53745EFC09FC53305A3
:10516000A5419307F4006376850017B70100232952
:10517000374363FDA724224697B7010023A2374394
:10518000050632C4E3DACAFA02C403250A008146DE
:1051900001462C00EFB02FDF6306652597B70100AD
:1051A00023A03741A24785073EC4E3D0FAFE02C4DC
:1051B00001463314CC00EFC0DFBF2A8D03250A005F
:1051C000814622862C00EFB00FDC09C597B701009D
:1051D00023A8373DEFC0FFBD3305A5419307F40079
:1051E0006376850017B70100232C373B63FAA71CB1
:1051F000224697B7010023A5373B050632C4E3DA00
:10520000CAFA03A50B0097B7010023A90738EFC01E
:10521000CFF983270900638997005145EFC0DFFB71
:1052200083270900E39B97FE5145EFC0FFFA97B72C
:10523000010023A5073602C403250A008146014662
:105240006C00EFB07FA4814601462C006306650127
:1052500097B7010023A6373503250A00EFB0AFD278
:1052600091456306650197B7010023AB3733832768
:10527000090003A50B006396970097B7010023A1CF
:105280003733EFC08FE083270900854503A50B0066
:105290006396970097B7010023A43731EFC0EFDE84
:1052A000A24785073EC4E3D9FAF883270900514590
:1052B00063899700EFC05FF2832709005145E39BA4
:1052C00097FEEFC07FF197B7010023A9072C02C416
:1052D00003250A00814601466C00EFB0FF9A630D7A
:1052E000650F97B7010023AD372BA24785073EC452
:1052F000E3D0FAFE03A50B00EFC02FEB83270900D4
:10530000638997005145EFC03FED83270900E39B78
:1053100097FE5145EFC05FEC97B7010023A0072827
:1053200002C403250A00814601462C00EFB0AFC538
:10533000814601466C006306650197B7010023A111
:10534000372703250A00EFB03F94914563066501B6
:1053500097B7010023A637258327090003A50B0073
:105360006396970097B7010023AC3723EFC0EFD1C6
:1053700083270900854503A50B006396970097B71F
:10538000010023AF3721EFC04FD0A24785073EC4AD
:10539000E3D9FAF883270900514563899700EFC0E4
:1053A000BFE3832709005145E39B97FEEFC0DFE28F
:1053B00083A70C00850717B701002327F71E9DBBA5
:1053C0002246050632C4E3D6CADE25BD22460506BE
:1053D00032C4E3D3CAD64DBBA24785073EC4E3D946
:1053E000FAEE09BFA24785073EC4E3D0FADAC1B39B
:1053F000411101469145154506C6EFB02FAC97B552
:1054000001009385E50597B7010023A3A71AEFB024
:105410001FCD814801488147094781461306004056
:1054200097B501009385050517050000130565CCA8
:10543000EFB05FEBB2408148014897B70100938716
:10544000E716054781461306004097B5010093858E
:10545000E50217050000130525BC41016FB09FE868
:1054600017B701001307471497B6010093868613F8
:1054700017B60100130606121C4310428C4217B5E2
:105480000100130565110328050001456386C50069
:10549000B38707413335F00097B701009387471072
:1054A0009C4394421843FD17B337F000B307F04014
:1054B00017B601002320D60E7D8D97B6010023ADCF
:1054C000E60C8280011122CC06CE26CA4AC84EC6FE
:1054D00052C458419307A00A2A8404416309F71073
:1054E0008146014681452685EFB00FFA8547631650
:1054F000F50097B7010023A3A70C05498549032AA6
:1055000004008146014681455285EFB0EFF7630400
:10551000250B9304800C8146014681455285EFB0EE
:105520008FA61C446300250D850717B701002327AC
:105530003709FD141CC4E5F08146014681455285BA
:10554000EFB06FA46316250197B7010023A82707C2
:10555000032A04008146014681455285EFB0AFA27F
:10556000630025079304800C8146014681455285DE
:10557000EFB08FF11C44630A2505850717B70100BA
:10558000232E3703FD141CC4E5F0814601468145F6
:105590005285EFB06FEFE31425F7032A040081462C
:1055A00001468145528597B7010023A92701EFB035
:1055B000AFEDE31025F797B7010023A1270191BFB5
:1055C00097B7010023AC27FF71BF8507FD141CC4EA
:1055D000C1FC8146014681455285EFB0EFEAE310F8
:1055E00025F365BF8507FD141CC495F4B1B781464A
:1055F000014681452685EFB00F9985476316F50072
:1056000097B7010023ACA7FA1309800C854981469E
:10561000014681452685EFB02FE71C44630A350318
:10562000850717B70100232B37F97D191CC4E31038
:1056300009FE2685814601468145EFB0EFE48547A6
:105640000440E31FF5E897B7010023A9A7F649BD79
:1056500085077D191CC4E31C09FAE1BF41119305BC
:10566000800C1305800C06C622C4EFB0AF8E97479E
:10567000030023A9A7149307A00A174703002325B3
:10568000F71481451305800C9747030023A00714E6
:10569000EFB04F8C9747030023ACA7129747030046
:1056A00023AA0712174403001304C41197470300E9
:1056B00023A40712084097B501009385A5DCEFB03D
:1056C0001FA2484497B501009385C5DCEFB03FA108
:1056D0001C40A1CF814801488147014797460300FC
:1056E0009386460E1306004097B50100938585DB2F
:1056F00017050000130545DDEFB0DFBE2244B240C0
:105700008148014881470147974603009386460C2C
:105710001306004097B50100938545D91705000091
:10572000130585DA41016FB0FFBB5C44C5F7B24099
:1057300022444101828017B70100130727E8104374
:10574000974703009387070817B701001307C7E6B9
:105750001843944701456389E600984713351600BE
:1057600097B6010023AAE6E417B70100130787E400
:10577000D44B18436388E600DC4B17B70100232B9A
:10578000F7E2828001458280797122D426D24AD004
:105790004ECE52CC56CA5AC85EC662C406D697B41C
:1057A00001009384A4E497B90100938969E217BAD0
:1057B0000100130AAAE197BA0100938A6AE297BB33
:1057C0000100938B2BE217BC0100130CACE00544E5
:1057D0000D49094B88408145EFB00FECE31C85FE75
:1057E00003A50900EFB0FFF7631C250B03250A0092
:1057F000EFB03FF76313250B83A70A006387870089
:1058000097B7010023A287DEF1B783A70B00E399C6
:1058100087FE83270C0003250A00850717B70100C0
:10582000232AF7DAEFC06F9803A50900EFC0EF97BE
:1058300083A70A006387870483A70B006383870419
:105840000145EFB05FFC6317650503A50900EFB0E4
:105850005FF1631D650503250A00EFB09FF0631437
:1058600065058840EFB00FA36306850097B7010078
:1058700023AC87D60145EFB01FF929DD73700430E2
:1058800001A0014597B7010023A087D6EFB0BFF76D
:10589000E30D65FB7370043001A07370043001A048
:1058A0007370043001A07370043001A07370043071
:1058B00001A0011122CC26CA4AC84EC652C406CE47
:1058C00017B90100130989D217BA0100130A8AD146
:1058D00097B40100938444D097B90100938909D00B
:1058E00005442DA097B7010023A087D09C4003A7B3
:1058F000090085076386E70097B7010023A687CED6
:105900009C40850717B701002328F7CC0325090021
:10591000F955EFB06FD8E31785FC83270A00E393AE
:1059200087FC03250900EFB0EF966306850097B763
:10593000010023AB87CA014597B7010023A287CA9C
:10594000EFC0DFF497B7010023AC07C845B70111DA
:105950004AC817B90100130969C90325090022CCF7
:105960004EC606CE26CA054497B90100938909C7D9
:10597000EFB04F9263058508A94403250900A145AE
:10598000EFB08FD163028508FD14514597B7010030
:1059900023AC87C4EFC05F84EDF0A9445145EFC04C
:1059A000BF8303250900FD14EFB0CF8E6306850089
:1059B00097B7010023AA87C2F5F003250900EFB0CD
:1059C0006F8D6316850097B7010023AF87C083A74B
:1059D00009000145850717B701002321F7C097B7D4
:1059E000010023A187C0EFC07FEA0325090097B714
:1059F000010023A907BEEFB0EF89E31F85F697B733
:105A0000010023A387BE8DBFFD145145EFC0CFFC1D
:105A1000ADF461B74111114506C6EFB0EF8197B5FE
:105A20000100938525A997B7010023A1A7BCEFB07A
:105A30000FEB97B70100938767BB9C43A5CF8148C5
:105A4000014897B701009387A7B809478146130615
:105A5000004097B501009385E5A6170500001305E2
:105A600045EFEFB03F888148014897B70100938721
:105A7000E7B5054781461306004097B501009385B9
:105A8000E5A417050000130505E3EFB0BF85B2409C
:105A9000814801488147014781461306004097B578
:105AA0000100938525A317050000130525CE4101AC
:105AB0006FB05F83B2404101828097B70100938746
:105AC000E7B197B60100938626B09843944263826B
:105AD000E6069C4397B601009386C6AE944217B77C
:105AE00001002323F7AE97B701009387E7AE9843F1
:105AF0006382E6069C4397B60100938666AC9442A7
:105B000017B701002320F7AC97B70100938787AC44
:105B100098436382E6069C4317B701002322F7AA45
:105B200097B70100938747AC88437D153335A000B4
:105B30008280854717B701002328F7AA97B601008E
:105B4000938646A897B70100938707A99843944284
:105B5000E392E6FA854717B701002327F7A897B61F
:105B600001009386E6A597B701009387A7A69843FF
:105B70009442E392E6FA854717B701002326F7A679
:105B800097B70100938747A688437D153335A0005A
:105B90008280AA95AA876385B70003C7070001E73B
:105BA0003385A74082808507FDB7814863DA050009
:105BB0003305A040B337A000B305B0409D8DFD581C
:105BC00063D906003306C040B337C000B306D040E7
:105BD0009D8E32883683AA872E87639F061C97A6E0
:105BE00001009386266D63F1C50C416E6377C60B89
:105BF000130EF00F6373CE002143335E6600F296FE
:105C000003CE06001A9E130300023303C341630C44
:105C10000300B3956500335EC50133186600336732
:105C2000BE00B3176500135E0801B355C703131513
:105C30000801418193D607013376C703B305B50246
:105C40004206D18E63F8B600C29663E5060163F39F
:105C5000B600C2968D8E33F7C603C207C183B3D692
:105C6000C603B306D50213150701C98F63F8D70021
:105C7000C29763E5070163F3D700C297958F33D5C9
:105C800067008145638A0800B307A0403337F000FE
:105C9000B305B0403E85998D8280370E00014143A7
:105CA000E36DC6F5614391BF01E6054833586802CC
:105CB00041676373E8081307F00F6373070121431B
:105CC00033576800BA9603C606001A9613030002FB
:105CD0003303C34063190306B38505419356080196
:105CE00013150801418113D6070133F7D502B3D547
:105CF000D5024207518FB305B5026378B7004297CA
:105D0000636507016373B7004297B305B74033F784
:105D1000D502C207C183B3D5D502B305B5021315A9
:105D20000701C98F63F8B700C29763E5070163F302
:105D3000B700C2978D8FA1B7370700014143E361D8
:105D4000E8F86143B5BF3318680033DEC500935EE1
:105D500008013356C500B31765003355DE03B3950C
:105D600065004D8E93150801C18193560601337766
:105D7000DE033385A5024207558F6378A70042975B
:105D8000636507016373A7004297B306A74033F723
:105D9000D60342064182B3D6D6034207B386D50264
:105DA000B365C70063F8D500C29563E5050163F3E9
:105DB000D500C295958D1DB7E3E6D5EC416863F536
:105DC0000605930EF00F33B8DE000E0833DE060131
:105DD00017A301001303034E7293834E0300130EA7
:105DE0000002C29E330EDE4163170E0263E4B6006A
:105DF0006369C500B307C540958D3335F50033871A
:105E0000A5403E85BA85BDBD370300014148E3EF9B
:105E100066FA614865BF3357D601B396C601D98E7D
:105E2000B357D50133D7D501B395C501CD8F93D5E0
:105E300006013373B702139F0601135F0F0113D8D6
:105E400007013316C6013315C5013357B7024203A4
:105E500033680301B30FEF023A83637CF80136988D
:105E60001303F7FF6367D8006375F8011303E7FFB7
:105E700036983308F841B37FB8023358B802C20FDE
:105E8000B3050F03139F0701135F0F0133EFEF01FA
:105E90004287637CBF00369F1307F8FF6367DF000C
:105EA0006375BF001307E8FF369F4203C16F33637A
:105EB000E3009387FFFF13580601330FBF40B3750C
:105EC000F30013530301F18F3387F502B307F30295
:105ED000B385050333030303BE95135807012E98BA
:105EE0006373F8007E93C167FD17935508013378FB
:105EF000F80042087D8F9A9542976366BF00631B46
:105F0000BF006379E5003306C7403337C700958D7E
:105F1000998D32873307E5403335E500B305BF403F
:105F2000898DB397D5013357C70133E5E700B3D562
:105F3000C50189BBAE87328836872A8363960620DF
:105F400097A801009388083763FEC50A4167637408
:105F5000E60A1307F00F3337C7000E07B356E60003
:105F6000B69883C60800369793060002998E99CAA0
:105F7000B397D7003357E5003318D600B365F70061
:105F80003313D50013550801B3D7A5021316080122
:105F900041829356030133F7A502B305F602420787
:105FA000D98E3E8763FCB600C2961387F7FF63E77E
:105FB000060163F5B6001387E7FFC2968D8EB3F72F
:105FC000A602420313530301B3D6A602C20733E36A
:105FD0006700B305D6023685637BB3004293138511
:105FE000F6FF636603016374B3001385E6FF42079F
:105FF000498F81454DA8B70600014147E360D6F6B9
:106000006147A9BF01E6854633D8C602C166637EF3
:10601000D8089306F00F63F306012147B356E80052
:10602000B69883C60800BA9613070002158F49E791
:10603000B38707418545135608019318080193D883
:1060400008019356030133F7C702B3D7C7024207CB
:10605000D98E3385F8023E8763FCA600C29613876B
:10606000F7FF63E7060163F5A6001387E7FFC29613
:10607000898EB3F7C602420313530301B3D6C60297
:10608000C20733E36700B388D8023685637B130108
:1060900042931385F6FF636603016374130113854E
:1060A000E6FF4207498F3A858280B70600014147E3
:1060B000E366D8F661479DB73318E800B3D5D7003B
:1060C0003313E500B356D50013550801B397E70025
:1060D00033F7A502B3E8F60093170801C18313D67E
:1060E0000801B3D5A5024207518FB386B7022E86A9
:1060F000637CD70042971386F5FF636707016375DA
:10610000D7001386E5FF4297B306D74033F7A602C0
:10611000C20893D80801B3D6A6024207B385D702B6
:10612000B3671701368763FCB700C2971387F6FF82
:1061300063E7070163F5B7001387E6FFC2978D8F0A
:1061400093150601D98DC5BD63E2D514416763FE81
:10615000E6021308F00F3337D8000E0733D8E600F5
:1061600097A5010093850515C29503C80500930501
:1061700000023A98B385054185E10547E3E5F6F26B
:106180003335C5001347150039BFB7050001414736
:10619000E3E6B6FC6147D9B733570601B396B600BC
:1061A000D98E93DE060133D70701B378D703B397AF
:1061B000B700335805013363F80093970601C18394
:1061C000135803013316B6003357D703C20833E818
:1061D0000801338FE7023A8E637CE8013698130E8C
:1061E000F7FF6367D8006375E801130EE7FF369881
:1061F0003308E841B378D8033358D803C208B38EC4
:10620000070393170301C183B3E7F800428763FCD8
:10621000D701B6971307F8FF63E7D70063F5D701F7
:106220001307E8FFB697420EB387D741C16E3367B5
:10623000EE001388FEFF337307019358070133788C
:1062400006014182330E03033388080393560E017F
:106250003303C30242939A96B388C80263F30601DC
:10626000F69813D60601B29863E01703E39317D9A3
:10627000C167FD17FD8EC206337EFE003315B500E3
:10628000F2968145E371D5E27D17A5B381450147BB
:1062900019BDB2883687AA872E886398061C97A6F0
:1062A00001009386260163F8C50A4163637E660890
:1062B0001303F00F6373C30021473353E6009A962C
:1062C00003CE0600130300023A9E3303C341630C5E
:1062D0000300B3956500335EC501B31866003368EB
:1062E000BE00B317650013D608013377C8021395B3
:1062F0000801418193D607013358C8024207D98E5D
:106300003308050363F80601C69663E5160163F3D7
:106310000601C696B386064133F7C602C207C1839B
:10632000B3D6C602B306D50213150701C98F63F8A9
:10633000D700C69763E5170163F3D700C697958F1B
:1063400033D5670081458280370300014147E3660A
:1063500066F661479DB701E60546B35816034166E8
:1063600063F3C8081306F00F63731601214733D691
:10637000E800B29603CE0600130300023A9E3303F0
:10638000C34163190306B385154113D7080113955B
:106390000801418113D60701B3F6E502B3D5E50242
:1063A000C206D18EB305B50263F8B600C69663E5A2
:1063B000160163F3B600C696B385B640B3F6E502A0
:1063C000C207C183B3D5E502B305B5021395060133
:1063D000C98F63F8B700C69763E5170163F3B70089
:1063E000C6978D8FB1BF370600014147E3E1C8F87A
:1063F0006147B5BFB398680033D7C501B3176500CF
:10640000335EC50113D50801B376A702B3956500C5
:10641000336EBE0093950801C18113560E013357A8
:10642000A702C206D18E3387E50263F8E600C6965E
:1064300063E5160163F3E600C6963386E640B3765D
:10644000A602420E135E0E013356A602C206338622
:10645000C502B3E5C60163F8C500C69563E515013D
:1064600063F3C500C695918D0DB7E3EED5EC41679A
:1064700063F5E604930EF00F33B7DE000E0733D357
:10648000E60097A801009388E8E29A9883CE080076
:10649000130E0002BA9E330EDE4163170E0263E450
:1064A000B6006369C500B307C540958D3335F50067
:1064B0003388A5403E85C28579B5B70800014147BC
:1064C000E3EF16FB614765BF3357D601B396C601AC
:1064D000D98EB357D50133D7D501B395C501CD8F2B
:1064E00093D506013373B702139F0601135F0F01A3
:1064F00093D807013316C6013315C5013357B702C8
:106500004203B36813013308EF023A8363FC0801C6
:10651000B6981303F7FF63E7D80063F50801130388
:10652000E7FFB698B3880841B3FFB802B3D8B80202
:10653000C20FB3051F03139F0701135F0F0133EF52
:10654000EF014687637CBF00369F1387F8FF6367C0
:10655000DF006375BF001387E8FF369F4203C16801
:106560003363E3009387F8FF13580601330FBF40EE
:10657000B375F30013530301F18F3387F502B307AB
:10658000F302B385050333030303BE9513580701D4
:106590002E986373F8004693C167FD179355080161
:1065A0003378F80042087D8F9A9542976366BF0062
:1065B000631BBF006379E5003306C7403337C7006C
:1065C000958D998D32873307E5403335E500B30566
:1065D000BF40898DB397D5013357C70133E5E70035
:1065E000B3D5C5018DB3011122CC26CA2A84AE844D
:1065F0004AC84EC652C456C206CEEFB08FFA1C40EF
:1066000003290401B7090001B3E59700930AC40008
:106610000CC08144FD19370A00021840638C2A031C
:10662000032609004A85B3654701B37636019317FF
:106630005600758F0329490063C4070001E7F1BFC5
:10664000E39DE6FC9317760063D30700D58CEFC07B
:106650006FE2E1B793C4F4FFF98C04C0EFB07F9907
:106660000840F2406244D2444249B249224A924A26
:1066700005618280411106C622C4EFE07FD7EFE0BA
:10668000FFFDEFF02FB917E7FFFF1307C77B814628
:1066900005469305400617A501001305A5DBEFD0BD
:1066A0006FB119C92A84EFB0CFF02A86014781461D
:1066B00085452285EFD0AFBCEFB08FC7B2402244F2
:0666C0000145410182804A
:02000004800278
:100000003E45FEFF3C46FEFF4645FEFF3C46FEFFEA
:100010003C46FEFF3C46FEFF3C46FEFF5E45FEFFC3
@ -1723,10 +1724,10 @@
:1004C0005265633100000000526563320000000095
:0804D0005265633300000000D7
:1004D8001000000000000000017A5200017C0101B8
:1004E8001B0D02001000000018000000AC56FEFFB3
:1004E8001B0D02001000000018000000B656FEFFA9
:1004F8008A03000000000000100000002C0000002B
:10050800225AFEFF5E0300000000000010000000F9
:10051800400000006C5DFEFF540300000000000076
:100508002C5AFEFF5E0300000000000010000000EF
:1005180040000000765DFEFF54030000000000006C
:0805EC00FC8F01000400000077
:040000058000004037
:00000001FF

View File

@ -288,8 +288,13 @@ class IBusDimension extends VexRiscvDimension("IBus") {
val catchAll = universes.contains(VexRiscvUniverse.CATCH_ALL)
val relaxedPcCalculation, twoCycleCache, injectorStage = r.nextBoolean()
val twoCycleRam = r.nextBoolean() && twoCycleCache
val cacheSize = 512 << r.nextInt(5)
val wayCount = 1 << r.nextInt(3)
var cacheSize = 0
var wayCount = 0
do{
cacheSize = 512 << r.nextInt(5)
wayCount = 1 << r.nextInt(3)
}while(cacheSize/wayCount < 512)
new VexRiscvPosition("Cached" + (if(twoCycleCache) "2cc" else "") + (if(injectorStage) "Injstage" else "") + (if(twoCycleRam) "2cr" else "") + "S" + cacheSize + "W" + wayCount + (if(relaxedPcCalculation) "Relax" else "") + (if(compressed) "Rvc" else "") + prediction.getClass.getTypeName().replace("$","")) with InstructionAnticipatedPosition{
override def testParam = "IBUS=CACHED" + (if(compressed) " COMPRESSED=yes" else "")
override def applyOn(config: VexRiscvConfig): Unit = config.plugins += new IBusCachedPlugin(
@ -457,7 +462,7 @@ class TestIndividualFeatures extends FunSuite {
new HazardDimension,
new RegFileDimension,
new SrcDimension,
new CsrDimension(sys.env.getOrElse("VEXRISCV_REGRESSION_FREERTOS_COUNT", "4")),
new CsrDimension(sys.env.getOrElse("VEXRISCV_REGRESSION_FREERTOS_COUNT", "yes")), //todo restore yes to 4 ?
new DecoderDimension,
new DebugDimension
)
@ -498,6 +503,7 @@ class TestIndividualFeatures extends FunSuite {
// val stdCmd = "make clean run REDO=40 DHRYSTONE=no STOP_ON_ERROR=yes TRACE=yess MMU=no"
val testCmd = stdCmd + (positionsToApply).map(_.testParam).mkString(" ")
println(testCmd)
val str = doCmd(testCmd)
assert(!str.contains("FAIL"))
// val intFind = "(\\d+\\.?)+".r
@ -516,13 +522,15 @@ class TestIndividualFeatures extends FunSuite {
// val seed = -2412372746600605141l
// val testId = Some(mutable.HashSet(1))
// val seed = 4331444545509090137l
// val testId = Some(mutable.HashSet[Int](32))
// val seed = -1807241812308067688l
//TODO restore all mai n.cpp rtos tests and restore config count in gcloud
val rand = new Random(seed)
test("Info"){
println(S"MAIN_SEED=$seed")
println(s"MAIN_SEED=$seed")
}
println(s"Seed=$seed")
for(i <- 0 until sys.env.getOrElse("VEXRISCV_REGRESSION_CONFIG_COUNT", "200").toInt){