diff -Nru xilinx-bootgen-2021.2/authentication-versal.cpp xilinx-bootgen-2022.1/authentication-versal.cpp --- xilinx-bootgen-2021.2/authentication-versal.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/authentication-versal.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1437,7 +1437,7 @@ { for (uint32_t index = 0; index < WORDS_PER_DEVICE_DNA; index++) { - deviceDNA[index] = ReadBigEndian32(dnaValue); + deviceDNA[WORDS_PER_DEVICE_DNA - (index+1)] = ReadBigEndian32(dnaValue); dnaValue += sizeof(uint32_t); } } @@ -1600,4 +1600,4 @@ { //AuthenticationContext::authKeyLength = EC_P521_KEY_LENGTH; } -} \ No newline at end of file +} diff -Nru xilinx-bootgen-2021.2/authkeys.cpp xilinx-bootgen-2022.1/authkeys.cpp --- xilinx-bootgen-2021.2/authkeys.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/authkeys.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -470,7 +470,7 @@ } fclose(file); } - if (eckey != NULL) + else if (eckey != NULL) { if (!secret) { @@ -488,6 +488,10 @@ } fclose(file); } + else + { + LOG_ERROR("Failed to generate authentication keys for the given algorithm."); + } } if (!fileWritten) diff -Nru xilinx-bootgen-2021.2/bif.l xilinx-bootgen-2022.1/bif.l --- xilinx-bootgen-2021.2/bif.l 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/bif.l 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2020 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -132,6 +132,8 @@ uboot yylval->number = PartitionOwner::UBOOT; return tok::POWNERVALUE ; pmc yylval->number = PartitionOwner::FSBL; return tok::POWNERVALUE ; non-pmc yylval->number = PartitionOwner::UBOOT; return tok::POWNERVALUE ; + plm yylval->number = PartitionOwner::FSBL; return tok::POWNERVALUE ; + non-plm yylval->number = PartitionOwner::UBOOT; return tok::POWNERVALUE ; partition_type return tok::PARTITION_TYPE; type return tok::PARTITION_TYPE; @@ -141,6 +143,7 @@ cfi-gsc yylval->number = PartitionType::CFI_GSC; return tok::PTYPEVALUE; slr-boot yylval->number = PartitionType::SLR_BOOT; return tok::PTYPEVALUE; slr-config yylval->number = PartitionType::SLR_CONFIG; return tok::PTYPEVALUE; + slr-slave yylval->number = PartitionType::SLR_SLAVE; return tok::PTYPEVALUE; keysrc_encryption yylval->number = tok::KEYSRC_ENCRYPTION; return tok::KEYSRC_ENCRYPTION; keysrc yylval->number = tok::KEYSRC_ENCRYPTION; return tok::KEYSRC_ENCRYPTION; diff -Nru xilinx-bootgen-2021.2/bif.tab.cpp xilinx-bootgen-2022.1/bif.tab.cpp --- xilinx-bootgen-2021.2/bif.tab.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/bif.tab.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -607,90 +607,96 @@ { currentBifOptions->SetEncryptionKeySource((yysemantic_stack_[(3) - (3)].encrkeysrc_t)); } break; - case 49: + case 47: /* Line 670 of lalr1.cc */ -#line 271 "../s/bif.y" - { currentImageBifOptions = new ImageBifOptions(); } +#line 265 "../s/bif.y" + { currentBifOptions->SetPdiType((yysemantic_stack_[(3) - (3)].ptype_t)); } break; case 50: /* Line 670 of lalr1.cc */ #line 272 "../s/bif.y" - { currentBifOptions->imageBifOptionList.push_back(currentImageBifOptions); } + { currentImageBifOptions = new ImageBifOptions(); } break; - case 58: + case 51: /* Line 670 of lalr1.cc */ -#line 286 "../s/bif.y" - { currentImageBifOptions->SetImageId((yysemantic_stack_[(3) - (3)].number)); } +#line 273 "../s/bif.y" + { currentBifOptions->imageBifOptionList.push_back(currentImageBifOptions); } break; case 59: /* Line 670 of lalr1.cc */ #line 287 "../s/bif.y" - { currentImageBifOptions->SetImageName((yysemantic_stack_[(3) - (3)].string)); } + { currentImageBifOptions->SetImageId((yysemantic_stack_[(3) - (3)].number)); } break; case 60: /* Line 670 of lalr1.cc */ #line 288 "../s/bif.y" - { currentImageBifOptions->SetDelayHandoff(true); } + { currentImageBifOptions->SetImageName((yysemantic_stack_[(3) - (3)].string)); } break; case 61: /* Line 670 of lalr1.cc */ #line 289 "../s/bif.y" - { currentImageBifOptions->SetDelayLoad(true); } + { currentImageBifOptions->SetDelayHandoff(true); } break; case 62: /* Line 670 of lalr1.cc */ #line 290 "../s/bif.y" - { currentImageBifOptions->SetMemCopyAddress((yysemantic_stack_[(3) - (3)].number)); } + { currentImageBifOptions->SetDelayLoad(true); } break; case 63: /* Line 670 of lalr1.cc */ #line 291 "../s/bif.y" - { currentImageBifOptions->SetImageType((yysemantic_stack_[(3) - (3)].ptype_t)); } + { currentImageBifOptions->SetMemCopyAddress((yysemantic_stack_[(3) - (3)].number)); } break; case 64: /* Line 670 of lalr1.cc */ #line 292 "../s/bif.y" - { currentImageBifOptions->SetUniqueId((yysemantic_stack_[(3) - (3)].number)); } + { currentImageBifOptions->SetImageType((yysemantic_stack_[(3) - (3)].ptype_t)); } break; case 65: /* Line 670 of lalr1.cc */ #line 293 "../s/bif.y" - { currentImageBifOptions->SetParentUniqueId((yysemantic_stack_[(3) - (3)].number)); } + { currentImageBifOptions->SetUniqueId((yysemantic_stack_[(3) - (3)].number)); } break; case 66: /* Line 670 of lalr1.cc */ #line 294 "../s/bif.y" + { currentImageBifOptions->SetParentUniqueId((yysemantic_stack_[(3) - (3)].number)); } + break; + + case 67: +/* Line 670 of lalr1.cc */ +#line 295 "../s/bif.y" { currentImageBifOptions->SetFunctionId((yysemantic_stack_[(3) - (3)].number)); } break; - case 72: + case 73: /* Line 670 of lalr1.cc */ -#line 307 "../s/bif.y" +#line 308 "../s/bif.y" { if(options.GetArchType() == Arch::VERSAL) LOG_WARNING("BIF attribute error !!! [keysrc_encryption] not supported in VERSAL architecture.\n\t Please see 'bootgen -arch versal -bif_help keysrc'"); currentBifOptions->SetEncryptionKeySource((yysemantic_stack_[(4) - (4)].encrkeysrc_t)); options.SetEncryptedKeySource((yysemantic_stack_[(4) - (4)].encrkeysrc_t)); } break; - case 73: + case 74: /* Line 670 of lalr1.cc */ -#line 310 "../s/bif.y" +#line 311 "../s/bif.y" { if(options.GetArchType() == Arch::ZYNQ) LOG_ERROR("BIF attribute error !!!\n\t\t[fsbl_config] not supported in ZYNQ architecture"); } break; - case 77: + case 78: /* Line 670 of lalr1.cc */ -#line 315 "../s/bif.y" +#line 316 "../s/bif.y" { if(options.GetArchType() == Arch::ZYNQ) LOG_ERROR("BIF attribute error !!!\n\t\t[bootdevice] not supported in ZYNQ architecture"); if(options.GetArchType() == Arch::VERSAL) @@ -698,100 +704,100 @@ currentBifOptions->SetBootDevice((yysemantic_stack_[(4) - (4)].bootdevice_t)); } break; - case 78: + case 79: /* Line 670 of lalr1.cc */ -#line 320 "../s/bif.y" +#line 321 "../s/bif.y" { LOG_ERROR("This usage of boot_device is no more supported.\n\t Please see 'bootgen -arch versal -bif_help boot_device'"); } break; - case 85: + case 86: /* Line 670 of lalr1.cc */ -#line 331 "../s/bif.y" +#line 332 "../s/bif.y" { currentBifOptions->SetBootDevice((yysemantic_stack_[(1) - (1)].bootdevice_t)); } break; - case 86: + case 87: /* Line 670 of lalr1.cc */ -#line 332 "../s/bif.y" +#line 333 "../s/bif.y" { currentBifOptions->SetBootDeviceAddress((yysemantic_stack_[(3) - (3)].number)); } break; - case 92: + case 93: /* Line 670 of lalr1.cc */ -#line 344 "../s/bif.y" +#line 345 "../s/bif.y" { currentBifOptions->SetAuthJtagRevokeID((yysemantic_stack_[(3) - (3)].number)); } break; - case 93: + case 94: /* Line 670 of lalr1.cc */ -#line 345 "../s/bif.y" +#line 346 "../s/bif.y" { currentBifOptions->SetAuthJtagDeviceDna((yysemantic_stack_[(3) - (3)].string)); } break; - case 94: + case 95: /* Line 670 of lalr1.cc */ -#line 346 "../s/bif.y" +#line 347 "../s/bif.y" { currentBifOptions->SetAuthJtagTimeOut((yysemantic_stack_[(3) - (3)].number)); } break; - case 95: + case 96: /* Line 670 of lalr1.cc */ -#line 349 "../s/bif.y" +#line 350 "../s/bif.y" { currentBifOptions->SetCore((yysemantic_stack_[(1) - (1)].core_t)); LOG_WARNING("[fsbl_config] a53_x64 | a53_x32 | r5_single | r5_dual is no more supported. Use 'destination_cpu' attribute for bootloader partition"); } break; - case 96: + case 97: /* Line 670 of lalr1.cc */ -#line 352 "../s/bif.y" +#line 353 "../s/bif.y" { currentBifOptions->SetBhRsa((yysemantic_stack_[(1) - (1)].bhrsa_t)); } break; - case 97: + case 98: /* Line 670 of lalr1.cc */ -#line 354 "../s/bif.y" +#line 355 "../s/bif.y" { LOG_ERROR("Authentication using SHA2 is no more supported."); } break; - case 98: + case 99: /* Line 670 of lalr1.cc */ -#line 356 "../s/bif.y" +#line 357 "../s/bif.y" { LOG_ERROR("[fsbl_config] bi_integrity_sha3 is no more supported. Use 'checksum' attribute of bootloader partition"); } break; - case 99: + case 100: /* Line 670 of lalr1.cc */ -#line 358 "../s/bif.y" +#line 359 "../s/bif.y" { currentBifOptions->SetPufHdLoc((yysemantic_stack_[(1) - (1)].pufhdloc_t)); } break; - case 100: + case 101: /* Line 670 of lalr1.cc */ -#line 360 "../s/bif.y" +#line 361 "../s/bif.y" { currentBifOptions->SetAuthOnly((yysemantic_stack_[(1) - (1)].authonly_t)); } break; - case 101: + case 102: /* Line 670 of lalr1.cc */ -#line 362 "../s/bif.y" +#line 363 "../s/bif.y" { currentBifOptions->SetOptKey((yysemantic_stack_[(1) - (1)].optkey_t)); } break; - case 102: + case 103: /* Line 670 of lalr1.cc */ -#line 364 "../s/bif.y" +#line 365 "../s/bif.y" { currentBifOptions->SetPufMode(PufMode::PUF4K); } break; - case 103: + case 104: /* Line 670 of lalr1.cc */ -#line 366 "../s/bif.y" +#line 367 "../s/bif.y" { currentBifOptions->SetShutterValue((yysemantic_stack_[(3) - (3)].number)); } break; - case 104: + case 105: /* Line 670 of lalr1.cc */ -#line 368 "../s/bif.y" +#line 369 "../s/bif.y" { if(options.GetArchType() != Arch::VERSAL) LOG_ERROR("BIF attribute error !!!\n\t\t'dpacm_enable' is supported only in VERSAL architecture"); if(options.GetArchType() == Arch::VERSAL) @@ -800,52 +806,52 @@ } break; - case 105: + case 106: /* Line 670 of lalr1.cc */ -#line 374 "../s/bif.y" +#line 375 "../s/bif.y" { if(((yysemantic_stack_[(3) - (3)].number) != 8) && ((yysemantic_stack_[(3) - (3)].number) !=16) && ((yysemantic_stack_[(3) - (3)].number) != 32) && ((yysemantic_stack_[(3) - (3)].number) != 0)) LOG_ERROR("Invalid smap_width value in BIF. Valid values are 8, 16 and 32"); currentBifOptions->smapWidth = (yysemantic_stack_[(3) - (3)].number); } break; - case 106: + case 107: /* Line 670 of lalr1.cc */ -#line 378 "../s/bif.y" +#line 379 "../s/bif.y" { currentBifOptions->SetBypassIdcodeFlag(true); } break; - case 107: + case 108: /* Line 670 of lalr1.cc */ -#line 379 "../s/bif.y" +#line 380 "../s/bif.y" { currentBifOptions->SetAHwRoTFlag(true); } break; - case 108: + case 109: /* Line 670 of lalr1.cc */ -#line 380 "../s/bif.y" +#line 381 "../s/bif.y" { currentBifOptions->SetSHwRoTFlag(true); } break; - case 109: + case 110: /* Line 670 of lalr1.cc */ -#line 383 "../s/bif.y" +#line 384 "../s/bif.y" { currentPartitionBifOptions = new PartitionBifOptions(); currentPartitionBifOptions->SetArchType(options.GetArchType()); } break; - case 110: + case 111: /* Line 670 of lalr1.cc */ -#line 386 "../s/bif.y" +#line 387 "../s/bif.y" { currentPartitionBifOptions->filename = (yysemantic_stack_[(5) - (5)].string); currentPartitionBifOptions->filelist.push_back((yysemantic_stack_[(5) - (5)].string)); currentBifOptions->Add(currentPartitionBifOptions, currentImageBifOptions); } break; - case 111: + case 112: /* Line 670 of lalr1.cc */ -#line 390 "../s/bif.y" +#line 391 "../s/bif.y" { currentPartitionBifOptions = new PartitionBifOptions(); currentPartitionBifOptions->SetArchType(options.GetArchType()); currentPartitionBifOptions->filename = (yysemantic_stack_[(1) - (1)].string); @@ -854,133 +860,127 @@ } break; - case 112: + case 113: /* Line 670 of lalr1.cc */ -#line 396 "../s/bif.y" +#line 397 "../s/bif.y" { currentPartitionBifOptions = new PartitionBifOptions(); currentPartitionBifOptions->SetArchType(options.GetArchType()); } break; - case 120: + case 121: /* Line 670 of lalr1.cc */ -#line 410 "../s/bif.y" +#line 411 "../s/bif.y" { currentPartitionBifOptions->filename = (yysemantic_stack_[(3) - (3)].string); currentPartitionBifOptions->filelist.push_back((yysemantic_stack_[(3) - (3)].string)); currentBifOptions->Add(currentPartitionBifOptions, currentImageBifOptions); } break; - case 121: + case 122: /* Line 670 of lalr1.cc */ -#line 413 "../s/bif.y" +#line 414 "../s/bif.y" { currentPartitionBifOptions->partitionId = (yysemantic_stack_[(3) - (3)].number); } break; - case 123: + case 124: /* Line 670 of lalr1.cc */ -#line 415 "../s/bif.y" +#line 416 "../s/bif.y" { currentPartitionBifOptions->fileType = (yysemantic_stack_[(3) - (3)].number); } break; - case 124: + case 125: /* Line 670 of lalr1.cc */ -#line 416 "../s/bif.y" +#line 417 "../s/bif.y" { currentPartitionBifOptions->bifSection = (yysemantic_stack_[(3) - (3)].string); currentPartitionBifOptions->filename = currentPartitionBifOptions->GetOutputFileFromBifSection(options.GetOutputFileNames().front(), (yysemantic_stack_[(3) - (3)].string)); currentBifOptions->Add(currentPartitionBifOptions, currentImageBifOptions); } break; - case 138: + case 139: /* Line 670 of lalr1.cc */ -#line 444 "../s/bif.y" +#line 445 "../s/bif.y" { if(options.GetArchType() != Arch::ZYNQMP) LOG_ERROR("BIF attribute error !!!\n\t\t[bootvectors] only supported in ZYNQMP architecture"); currentBifOptions->SetBootVectorArray((yysemantic_stack_[(1) - (1)].number)); } break; - case 139: -/* Line 670 of lalr1.cc */ -#line 449 "../s/bif.y" - { currentPartitionBifOptions->SetAuthBlockAttr((yysemantic_stack_[(1) - (1)].number)); } - break; - case 140: /* Line 670 of lalr1.cc */ -#line 451 "../s/bif.y" - { currentPartitionBifOptions->bootloader = true;} +#line 450 "../s/bif.y" + { currentPartitionBifOptions->SetAuthBlockAttr((yysemantic_stack_[(1) - (1)].number)); } break; case 141: /* Line 670 of lalr1.cc */ #line 452 "../s/bif.y" - { currentPartitionBifOptions->boot = true;} + { currentPartitionBifOptions->bootloader = true;} break; case 142: /* Line 670 of lalr1.cc */ #line 453 "../s/bif.y" - { currentPartitionBifOptions->user = true;} + { currentPartitionBifOptions->boot = true;} break; case 143: /* Line 670 of lalr1.cc */ #line 454 "../s/bif.y" - { currentPartitionBifOptions->Static = true;} + { currentPartitionBifOptions->user = true;} break; case 144: /* Line 670 of lalr1.cc */ #line 455 "../s/bif.y" - { currentPartitionBifOptions->noautostart = true;} + { currentPartitionBifOptions->Static = true;} break; case 145: /* Line 670 of lalr1.cc */ #line 456 "../s/bif.y" - { currentPartitionBifOptions->multiboot = true;} + { currentPartitionBifOptions->noautostart = true;} break; case 146: /* Line 670 of lalr1.cc */ #line 457 "../s/bif.y" - { currentPartitionBifOptions->Protected = true;} + { currentPartitionBifOptions->multiboot = true;} break; case 147: /* Line 670 of lalr1.cc */ #line 458 "../s/bif.y" - { currentPartitionBifOptions->SetEarlyHandoff(true); } + { currentPartitionBifOptions->Protected = true;} break; case 148: /* Line 670 of lalr1.cc */ #line 459 "../s/bif.y" - { currentPartitionBifOptions->SetHivec(true); } + { currentPartitionBifOptions->SetEarlyHandoff(true); } break; case 149: /* Line 670 of lalr1.cc */ #line 460 "../s/bif.y" - { if(currentPartitionBifOptions->bootloader!=true) - LOG_ERROR("XIP mode can be enabled only for bootloader"); - currentBifOptions->SetXipMode(); } + { currentPartitionBifOptions->SetHivec(true); } break; case 150: /* Line 670 of lalr1.cc */ -#line 463 "../s/bif.y" - { currentPartitionBifOptions->fileType = (yysemantic_stack_[(1) - (1)].number); } +#line 461 "../s/bif.y" + { if(currentPartitionBifOptions->bootloader!=true) + LOG_ERROR("XIP mode can be enabled only for bootloader"); + currentBifOptions->SetXipMode(); } break; case 151: /* Line 670 of lalr1.cc */ #line 464 "../s/bif.y" - { currentPartitionBifOptions->bootImage = true; } + { currentPartitionBifOptions->fileType = (yysemantic_stack_[(1) - (1)].number); } break; case 152: /* Line 670 of lalr1.cc */ #line 465 "../s/bif.y" - { currentPartitionBifOptions->fileType = (yysemantic_stack_[(1) - (1)].number); } + { currentPartitionBifOptions->bootImage = true; } break; case 153: @@ -992,386 +992,392 @@ case 154: /* Line 670 of lalr1.cc */ #line 467 "../s/bif.y" - { currentPartitionBifOptions->SetPartitionType((yysemantic_stack_[(1) - (1)].ptype_t)); } + { currentPartitionBifOptions->fileType = (yysemantic_stack_[(1) - (1)].number); } break; case 155: /* Line 670 of lalr1.cc */ -#line 470 "../s/bif.y" - { currentPartitionBifOptions->SetTrustZone(::TrustZone::Secure); } +#line 468 "../s/bif.y" + { currentPartitionBifOptions->SetPartitionType((yysemantic_stack_[(1) - (1)].ptype_t)); } break; case 156: /* Line 670 of lalr1.cc */ #line 471 "../s/bif.y" - { currentPartitionBifOptions->SetTrustZone((yysemantic_stack_[(3) - (3)].trustzone_t)); } + { currentPartitionBifOptions->SetTrustZone(::TrustZone::Secure); } break; case 157: /* Line 670 of lalr1.cc */ -#line 474 "../s/bif.y" - { currentPartitionBifOptions->SetEncryptionBlocks((yysemantic_stack_[(1) - (1)].number)); } +#line 472 "../s/bif.y" + { currentPartitionBifOptions->SetTrustZone((yysemantic_stack_[(3) - (3)].trustzone_t)); } break; case 158: /* Line 670 of lalr1.cc */ #line 475 "../s/bif.y" - { currentPartitionBifOptions->SetEncryptionBlocks((yysemantic_stack_[(4) - (1)].number), (yysemantic_stack_[(4) - (3)].number)); } + { currentPartitionBifOptions->SetEncryptionBlocks((yysemantic_stack_[(1) - (1)].number)); } break; case 159: /* Line 670 of lalr1.cc */ #line 476 "../s/bif.y" - { currentPartitionBifOptions->SetEncryptionBlocks((yysemantic_stack_[(4) - (1)].number), 0); } + { currentPartitionBifOptions->SetEncryptionBlocks((yysemantic_stack_[(4) - (1)].number), (yysemantic_stack_[(4) - (3)].number)); } break; case 160: /* Line 670 of lalr1.cc */ -#line 478 "../s/bif.y" - { currentPartitionBifOptions->SetAuthType((yysemantic_stack_[(3) - (3)].authvalue_t)); } +#line 477 "../s/bif.y" + { currentPartitionBifOptions->SetEncryptionBlocks((yysemantic_stack_[(4) - (1)].number), 0); } break; case 161: /* Line 670 of lalr1.cc */ #line 479 "../s/bif.y" - { currentPartitionBifOptions->SetEncryptType((yysemantic_stack_[(3) - (3)].encrvalue_t)); } + { currentPartitionBifOptions->SetAuthType((yysemantic_stack_[(3) - (3)].authvalue_t)); } break; case 162: /* Line 670 of lalr1.cc */ #line 480 "../s/bif.y" - { currentPartitionBifOptions->SetChecksumType((yysemantic_stack_[(3) - (3)].checksumvalue_t)); } + { currentPartitionBifOptions->SetEncryptType((yysemantic_stack_[(3) - (3)].encrvalue_t)); } break; case 163: /* Line 670 of lalr1.cc */ #line 481 "../s/bif.y" - { currentPartitionBifOptions->SetOwnerType((yysemantic_stack_[(3) - (3)].powner_t)); } + { currentPartitionBifOptions->SetChecksumType((yysemantic_stack_[(3) - (3)].checksumvalue_t)); } break; case 164: /* Line 670 of lalr1.cc */ #line 482 "../s/bif.y" - { currentPartitionBifOptions->SetDestCpu((yysemantic_stack_[(3) - (3)].destcpu_t)); } + { currentPartitionBifOptions->SetOwnerType((yysemantic_stack_[(3) - (3)].powner_t)); } break; case 165: /* Line 670 of lalr1.cc */ #line 483 "../s/bif.y" - { currentPartitionBifOptions->SetDestDevice((yysemantic_stack_[(3) - (3)].destdevice_t)); } + { currentPartitionBifOptions->SetDestCpu((yysemantic_stack_[(3) - (3)].destcpu_t)); } break; case 166: /* Line 670 of lalr1.cc */ #line 484 "../s/bif.y" - { currentPartitionBifOptions->SetExceptionLevel((yysemantic_stack_[(3) - (3)].el_t)); } + { currentPartitionBifOptions->SetDestDevice((yysemantic_stack_[(3) - (3)].destdevice_t)); } break; case 167: /* Line 670 of lalr1.cc */ #line 485 "../s/bif.y" - { currentPartitionBifOptions->SetAesKeyFile((yysemantic_stack_[(3) - (3)].string)); } + { currentPartitionBifOptions->SetExceptionLevel((yysemantic_stack_[(3) - (3)].el_t)); } break; case 168: /* Line 670 of lalr1.cc */ #line 486 "../s/bif.y" - { currentPartitionBifOptions->ppkFile = ((yysemantic_stack_[(3) - (3)].string)); } + { currentPartitionBifOptions->SetAesKeyFile((yysemantic_stack_[(3) - (3)].string)); } break; case 169: /* Line 670 of lalr1.cc */ #line 487 "../s/bif.y" - { currentPartitionBifOptions->pskFile = ((yysemantic_stack_[(3) - (3)].string)); } + { currentPartitionBifOptions->ppkFile = ((yysemantic_stack_[(3) - (3)].string)); } break; case 170: /* Line 670 of lalr1.cc */ #line 488 "../s/bif.y" - { currentPartitionBifOptions->spkFile = ((yysemantic_stack_[(3) - (3)].string)); } + { currentPartitionBifOptions->pskFile = ((yysemantic_stack_[(3) - (3)].string)); } break; case 171: /* Line 670 of lalr1.cc */ #line 489 "../s/bif.y" - { currentPartitionBifOptions->sskFile = ((yysemantic_stack_[(3) - (3)].string)); } + { currentPartitionBifOptions->spkFile = ((yysemantic_stack_[(3) - (3)].string)); } break; case 172: /* Line 670 of lalr1.cc */ #line 490 "../s/bif.y" - { currentPartitionBifOptions->spkSelect =((yysemantic_stack_[(3) - (3)].spkselect_t)); currentPartitionBifOptions->spkSelLocal = true; } + { currentPartitionBifOptions->sskFile = ((yysemantic_stack_[(3) - (3)].string)); } break; case 173: /* Line 670 of lalr1.cc */ #line 491 "../s/bif.y" - { currentPartitionBifOptions->SetSpkId((yysemantic_stack_[(3) - (3)].number)); } + { currentPartitionBifOptions->spkSelect =((yysemantic_stack_[(3) - (3)].spkselect_t)); currentPartitionBifOptions->spkSelLocal = true; } break; case 174: /* Line 670 of lalr1.cc */ #line 492 "../s/bif.y" - { currentPartitionBifOptions->spkSignatureFile = ((yysemantic_stack_[(3) - (3)].string)); } + { currentPartitionBifOptions->SetSpkId((yysemantic_stack_[(3) - (3)].number)); } break; - case 176: + case 175: /* Line 670 of lalr1.cc */ -#line 494 "../s/bif.y" - { currentPartitionBifOptions->SetPartitionType((yysemantic_stack_[(3) - (3)].ptype_t)); } +#line 493 "../s/bif.y" + { currentPartitionBifOptions->spkSignatureFile = ((yysemantic_stack_[(3) - (3)].string)); } break; case 177: /* Line 670 of lalr1.cc */ #line 495 "../s/bif.y" - { currentPartitionBifOptions->SetEncryptionKeySource((yysemantic_stack_[(3) - (3)].encrkeysrc_t)); } + { currentPartitionBifOptions->SetPartitionType((yysemantic_stack_[(3) - (3)].ptype_t)); } break; case 178: /* Line 670 of lalr1.cc */ #line 496 "../s/bif.y" - { currentPartitionBifOptions->SetRevokeId((yysemantic_stack_[(3) - (3)].number)); } + { currentPartitionBifOptions->SetEncryptionKeySource((yysemantic_stack_[(3) - (3)].encrkeysrc_t)); } break; case 179: /* Line 670 of lalr1.cc */ #line 497 "../s/bif.y" - { currentPartitionBifOptions->SetDpaCM(DpaCM::DpaCMEnable); } + { currentPartitionBifOptions->SetRevokeId((yysemantic_stack_[(3) - (3)].number)); } break; case 180: /* Line 670 of lalr1.cc */ #line 498 "../s/bif.y" - { currentPartitionBifOptions->SetSlrNum((yysemantic_stack_[(3) - (3)].number)); } + { currentPartitionBifOptions->SetDpaCM(DpaCM::DpaCMEnable); } break; case 181: /* Line 670 of lalr1.cc */ #line 499 "../s/bif.y" + { currentPartitionBifOptions->SetSlrNum((yysemantic_stack_[(3) - (3)].number)); } + break; + + case 182: +/* Line 670 of lalr1.cc */ +#line 500 "../s/bif.y" { currentPartitionBifOptions->SetPufHdLocation(PufHdLoc::PUFinBH); } break; - case 190: + case 191: /* Line 670 of lalr1.cc */ -#line 512 "../s/bif.y" +#line 513 "../s/bif.y" { (yyval.authvalue_t) = ::Authentication::None;} break; - case 192: + case 193: /* Line 670 of lalr1.cc */ -#line 516 "../s/bif.y" +#line 517 "../s/bif.y" { (yyval.encrvalue_t) = ::Encryption::None;} break; - case 194: + case 195: /* Line 670 of lalr1.cc */ -#line 520 "../s/bif.y" +#line 521 "../s/bif.y" { (yyval.checksumvalue_t) = ::Checksum::None;} break; - case 211: -/* Line 670 of lalr1.cc */ -#line 569 "../s/bif.y" - { currentPartitionBifOptions->alignment = (yysemantic_stack_[(3) - (3)].number); } - break; - case 212: /* Line 670 of lalr1.cc */ #line 570 "../s/bif.y" - { currentPartitionBifOptions->offset = (yysemantic_stack_[(3) - (3)].number); } + { currentPartitionBifOptions->alignment = (yysemantic_stack_[(3) - (3)].number); } break; case 213: /* Line 670 of lalr1.cc */ #line 571 "../s/bif.y" - { currentPartitionBifOptions->SetReserveLength((yysemantic_stack_[(3) - (3)].number), false); } + { currentPartitionBifOptions->offset = (yysemantic_stack_[(3) - (3)].number); } break; case 214: /* Line 670 of lalr1.cc */ #line 572 "../s/bif.y" - { currentPartitionBifOptions->SetReserveLength((yysemantic_stack_[(3) - (3)].number), true); } + { currentPartitionBifOptions->SetReserveLength((yysemantic_stack_[(3) - (3)].number), false); } break; case 215: /* Line 670 of lalr1.cc */ #line 573 "../s/bif.y" - { currentPartitionBifOptions->load = (yysemantic_stack_[(3) - (3)].number); } + { currentPartitionBifOptions->SetReserveLength((yysemantic_stack_[(3) - (3)].number), true); } break; case 216: /* Line 670 of lalr1.cc */ #line 574 "../s/bif.y" - { currentPartitionBifOptions->startup = (yysemantic_stack_[(3) - (3)].number); } + { currentPartitionBifOptions->load = (yysemantic_stack_[(3) - (3)].number); } break; case 217: /* Line 670 of lalr1.cc */ #line 575 "../s/bif.y" - { currentPartitionBifOptions->bigEndian = true; } + { currentPartitionBifOptions->startup = (yysemantic_stack_[(3) - (3)].number); } break; case 218: /* Line 670 of lalr1.cc */ #line 576 "../s/bif.y" - { currentPartitionBifOptions->a32Mode = true; } + { currentPartitionBifOptions->bigEndian = true; } break; case 219: /* Line 670 of lalr1.cc */ #line 577 "../s/bif.y" - { currentPartitionBifOptions->pid = (yysemantic_stack_[(3) - (3)].number); } + { currentPartitionBifOptions->a32Mode = true; } break; case 220: /* Line 670 of lalr1.cc */ -#line 580 "../s/bif.y" - { currentPartitionBifOptions->presignFile = (yysemantic_stack_[(3) - (3)].string); } +#line 578 "../s/bif.y" + { currentPartitionBifOptions->pid = (yysemantic_stack_[(3) - (3)].number); } break; case 221: /* Line 670 of lalr1.cc */ #line 581 "../s/bif.y" + { currentPartitionBifOptions->presignFile = (yysemantic_stack_[(3) - (3)].string); } + break; + + case 222: +/* Line 670 of lalr1.cc */ +#line 582 "../s/bif.y" { currentPartitionBifOptions->SetUdfDataFile((yysemantic_stack_[(3) - (3)].string)); } break; - case 238: + case 239: /* Line 670 of lalr1.cc */ -#line 606 "../s/bif.y" +#line 607 "../s/bif.y" { if(options.GetArchType() != Arch::ZYNQMP) LOG_ERROR("BIF attribute error !!!\n\t\t[auth_params] is supported only in ZYNQMP architecture"); currentBifOptions->SetPPKSelection((yysemantic_stack_[(3) - (3)].number)); } break; - case 239: + case 240: /* Line 670 of lalr1.cc */ -#line 609 "../s/bif.y" +#line 610 "../s/bif.y" { if(options.GetArchType() != Arch::ZYNQMP) LOG_ERROR("BIF attribute error !!!\n\t\t[auth_params] is supported only in ZYNQMP architecture"); currentBifOptions->SetSPKSelection((yysemantic_stack_[(3) - (3)].spkselect_t)); } break; - case 240: + case 241: /* Line 670 of lalr1.cc */ -#line 612 "../s/bif.y" +#line 613 "../s/bif.y" { if(options.GetArchType() != Arch::ZYNQMP) LOG_WARNING("BIF attribute error !!!\n\t\t[auth_params] is supported only in ZYNQMP architecture"); currentBifOptions->SetSpkId((yysemantic_stack_[(3) - (3)].number)); } break; - case 241: + case 242: /* Line 670 of lalr1.cc */ -#line 615 "../s/bif.y" +#line 616 "../s/bif.y" { if(options.GetArchType() != Arch::ZYNQMP) LOG_ERROR("BIF attribute error !!!\n\t\t[auth_params] is supported only in ZYNQMP architecture"); currentBifOptions->SetHeaderAuthentication(); } break; - case 244: + case 245: /* Line 670 of lalr1.cc */ -#line 624 "../s/bif.y" +#line 625 "../s/bif.y" { if(options.GetArchType() != Arch::ZYNQMP) LOG_ERROR("BIF attribute error !!!\n\t\t[split] not supported in ZYNQ architecture"); currentBifOptions->SetSplitMode((yysemantic_stack_[(3) - (3)].splitmode_t)); } break; - case 248: + case 249: /* Line 670 of lalr1.cc */ -#line 634 "../s/bif.y" +#line 635 "../s/bif.y" { if(options.GetArchType() != Arch::ZYNQMP) LOG_ERROR("BIF attribute error !!!\n\t\t[split] not supported in ZYNQ architecture"); currentBifOptions->SetSplitFmt(File::MCS); } break; - case 249: + case 250: /* Line 670 of lalr1.cc */ -#line 637 "../s/bif.y" +#line 638 "../s/bif.y" { if(options.GetArchType() != Arch::ZYNQMP) LOG_ERROR("BIF attribute error !!!\n\t\t[split] not supported in ZYNQ architecture"); currentBifOptions->SetSplitFmt(File::BIN); } break; - case 254: + case 255: /* Line 670 of lalr1.cc */ -#line 649 "../s/bif.y" +#line 650 "../s/bif.y" { (yyval.number) = (yysemantic_stack_[(3) - (2)].number); } break; - case 256: + case 257: /* Line 670 of lalr1.cc */ -#line 656 "../s/bif.y" +#line 657 "../s/bif.y" {(yyval.number) = (yysemantic_stack_[(2) - (2)].number); *options.debugstr << (yyval.number) << " + " << (yysemantic_stack_[(2) - (2)].number) << std::endl;} break; - case 257: + case 258: /* Line 670 of lalr1.cc */ -#line 657 "../s/bif.y" +#line 658 "../s/bif.y" {(yyval.number) = ~(yysemantic_stack_[(2) - (2)].number); *options.debugstr << (yyval.number) << " ~ " << (yysemantic_stack_[(2) - (2)].number) << std::endl;} break; - case 259: + case 260: /* Line 670 of lalr1.cc */ -#line 662 "../s/bif.y" +#line 663 "../s/bif.y" {(yyval.number) = (yysemantic_stack_[(3) - (1)].number) * (yysemantic_stack_[(3) - (3)].number); *options.debugstr << (yyval.number) << " = " << (yysemantic_stack_[(3) - (1)].number) << " + " << (yysemantic_stack_[(3) - (3)].number) << std::endl;} break; - case 260: + case 261: /* Line 670 of lalr1.cc */ -#line 663 "../s/bif.y" +#line 664 "../s/bif.y" {(yyval.number) = (yysemantic_stack_[(3) - (1)].number) / (yysemantic_stack_[(3) - (3)].number); *options.debugstr << (yyval.number) << " = " << (yysemantic_stack_[(3) - (1)].number) << " / " << (yysemantic_stack_[(3) - (3)].number) << std::endl;} break; - case 261: + case 262: /* Line 670 of lalr1.cc */ -#line 664 "../s/bif.y" +#line 665 "../s/bif.y" {(yyval.number) = (yysemantic_stack_[(3) - (1)].number) % (yysemantic_stack_[(3) - (3)].number); *options.debugstr << (yyval.number) << " = " << (yysemantic_stack_[(3) - (1)].number) << " % " << (yysemantic_stack_[(3) - (3)].number) << std::endl;} break; - case 263: + case 264: /* Line 670 of lalr1.cc */ -#line 668 "../s/bif.y" +#line 669 "../s/bif.y" {(yyval.number) = (yysemantic_stack_[(3) - (1)].number) + (yysemantic_stack_[(3) - (3)].number);*options.debugstr << (yyval.number) << " = " << (yysemantic_stack_[(3) - (1)].number) << " + " << (yysemantic_stack_[(3) - (3)].number) << std::endl;} break; - case 264: + case 265: /* Line 670 of lalr1.cc */ -#line 669 "../s/bif.y" +#line 670 "../s/bif.y" {(yyval.number) = (yysemantic_stack_[(3) - (1)].number) - (yysemantic_stack_[(3) - (3)].number);*options.debugstr << (yyval.number) << " = " << (yysemantic_stack_[(3) - (1)].number) << " - " << (yysemantic_stack_[(3) - (3)].number) << std::endl;} break; - case 266: + case 267: /* Line 670 of lalr1.cc */ -#line 673 "../s/bif.y" +#line 674 "../s/bif.y" {(yyval.number) = (yysemantic_stack_[(3) - (1)].number) << (yysemantic_stack_[(3) - (3)].number);*options.debugstr << (yyval.number) << " = " << (yysemantic_stack_[(3) - (1)].number) << " << " << (yysemantic_stack_[(3) - (3)].number) << std::endl;} break; - case 267: + case 268: /* Line 670 of lalr1.cc */ -#line 674 "../s/bif.y" +#line 675 "../s/bif.y" {(yyval.number) = (yysemantic_stack_[(3) - (1)].number) >> (yysemantic_stack_[(3) - (3)].number);*options.debugstr << (yyval.number) << " = " << (yysemantic_stack_[(3) - (1)].number) << " >> " << (yysemantic_stack_[(3) - (3)].number) << std::endl;} break; - case 269: + case 270: /* Line 670 of lalr1.cc */ -#line 678 "../s/bif.y" +#line 679 "../s/bif.y" {(yyval.number) = (yysemantic_stack_[(3) - (1)].number) & (yysemantic_stack_[(3) - (3)].number);*options.debugstr << (yyval.number) << " = " << (yysemantic_stack_[(3) - (1)].number) << " & " << (yysemantic_stack_[(3) - (3)].number) << std::endl;} break; - case 271: + case 272: /* Line 670 of lalr1.cc */ -#line 682 "../s/bif.y" +#line 683 "../s/bif.y" {(yyval.number) = (yysemantic_stack_[(3) - (1)].number) ^ (yysemantic_stack_[(3) - (3)].number);*options.debugstr << (yyval.number) << " = " << (yysemantic_stack_[(3) - (1)].number) << " ^ " << (yysemantic_stack_[(3) - (3)].number) << std::endl;} break; - case 273: + case 274: /* Line 670 of lalr1.cc */ -#line 687 "../s/bif.y" +#line 688 "../s/bif.y" {(yyval.number) = (yysemantic_stack_[(3) - (1)].number) | (yysemantic_stack_[(3) - (3)].number);*options.debugstr << (yyval.number) << " = " << (yysemantic_stack_[(3) - (1)].number) << " | " << (yysemantic_stack_[(3) - (3)].number) << std::endl;} break; /* Line 670 of lalr1.cc */ -#line 1375 "../bisonflex/bif.tab.cpp" +#line 1381 "../bisonflex/bif.tab.cpp" default: break; } @@ -1583,59 +1589,59 @@ /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ - const short int BisonParser::yypact_ninf_ = -380; + const short int BisonParser::yypact_ninf_ = -358; const short int BisonParser::yypact_[] = { - -380, 12, -62, -380, -380, -380, 28, 17, -380, 679, - -380, -380, 116, 108, 46, 71, 78, 88, 91, -380, - 96, -380, -380, 95, 100, 110, -380, -380, -380, -380, - -380, -380, -380, -380, -380, -380, -380, -380, -380, -380, - -380, -380, -380, -380, -380, -380, -380, 68, -380, -380, - 65, -380, -380, -380, 134, -380, -380, -380, 492, 131, - 144, 152, -380, 162, 164, 616, -17, 77, 222, 222, - 222, -380, 222, 65, -380, 57, 171, -16, -380, -380, - -380, -380, 52, -380, -380, -380, -380, 204, 208, 209, - 214, 215, 216, 217, 218, 220, 221, 224, 225, 229, - 232, 233, 235, -380, -380, 238, 244, 245, -380, -380, - -380, -380, -380, -380, 247, 249, 250, 251, 258, 260, - 261, 266, 267, -380, -380, -380, -380, -380, 270, 272, - 273, 275, 276, 284, -380, -380, -380, 287, 13, 368, - -380, -380, -380, -380, -380, -380, -380, -380, -380, 77, - 222, 57, 243, 159, 145, 286, 294, 302, 303, -380, - 304, 305, -380, -380, -380, -380, 222, 222, 222, -380, - -380, 5, 6, 23, 183, 177, 186, 186, 186, -380, - 186, 176, -380, -380, -380, -380, -380, -380, 318, 319, - -380, -380, -380, -380, -380, -380, -380, -380, 327, 332, - -380, -380, -380, -380, -380, -380, -380, -380, 333, 336, - 337, 334, 49, -380, -42, -7, -69, 226, 754, 222, - 227, 213, 223, 230, 222, 222, 222, 222, 222, 222, - 222, 210, 222, 222, 222, 52, 280, 52, 222, 222, - 52, 57, 52, 52, 52, 52, 52, 52, -380, 492, - -380, 492, -380, -380, -380, 343, 186, -380, 171, 352, - 353, 356, -380, 355, 360, 361, 363, 252, 52, 616, - 222, -380, -17, -380, -380, -61, 222, 222, 222, 222, - 222, 222, 222, 222, 222, 222, 248, 365, 372, 387, - 401, 413, 417, 418, 420, 421, 422, 423, 424, 425, - -380, -380, 386, 136, 222, 222, -380, 171, 222, 357, - 222, -380, -16, -380, -380, -380, -380, -380, -380, -380, - -380, -380, -380, -380, -380, -380, -380, -380, 186, -380, - -380, -380, -380, -380, -380, -380, 186, 186, 186, 186, - 186, 186, 186, -380, -380, 186, -380, 426, -44, -380, - 186, -380, -380, -380, 186, 186, -380, -380, -380, -380, - -380, -380, -380, -380, -380, -380, 222, -380, 222, 222, - 210, 159, 298, 148, 145, -380, -380, -380, 186, -380, - -380, -380, -380, -380, 5, 5, 6, 6, 23, 183, - 177, -380, 427, 431, 432, 433, 434, 435, -380, -380, - 437, -380, 264, -380, -380, -42, -7, -69, 222, 222, - 52, 57, 52, 52, 52, 52, 52, 52, -380, 176, - -380, 186, 186, -380, 186, -380, 186, -380, 222, -65, - -380, 186, 186, -380, 355, -380, -380, -380, -380, -380, - 363, 252, 222, 222, 222, 222, 369, 222, 384, -380, - -380, -380, -380, 186, -380, 438, -43, -380, -380, -380, - -380, -380, -380, -380, -380, -380, -380, 295, -51, -380, - 186, 186, 186, 186, -380, 186, -380, 222, 127, -380, - -380, -380, 297, -47, -380, -380 + -358, 12, -11, -358, -358, -358, 60, 79, -358, 712, + -358, -358, 185, 83, 103, 85, 102, 104, 128, 139, + -358, 140, -358, -358, 142, 153, 171, -358, -358, -358, + -358, -358, -358, -358, -358, -358, -358, -358, -358, -358, + -358, -358, -358, -358, -358, -358, -358, -358, 109, -358, + -358, 8, -358, -358, -358, 173, -358, -358, -358, 524, + 191, 199, 200, -358, 203, 207, 648, 99, 20, 92, + 134, 134, 134, -358, 134, 8, -358, 101, 169, 39, + -358, -358, -358, -358, -4, -358, -358, -358, -358, 217, + 218, 219, 221, 222, 227, 228, 229, 233, 234, 236, + 239, 247, 248, 249, 250, -358, -358, 251, 256, 261, + -358, -358, -358, -358, -358, -358, 265, 267, 268, 269, + 272, 273, 274, 279, 292, -358, -358, -358, -358, -358, + 293, 294, 299, 302, 303, 304, -358, -358, -358, 307, + 9, 400, -358, -358, -358, -358, -358, -358, -358, -358, + -358, 92, 134, 101, 296, 160, 58, 308, 305, 310, + -358, 313, -358, 318, 319, -358, -358, -358, -358, 134, + 134, 134, -358, -358, 28, 7, 42, 184, 187, 190, + 190, 190, -358, 190, 177, -358, -358, -358, -358, -358, + -358, 322, 323, -358, -358, -358, -358, -358, -358, -358, + -358, 328, 329, -358, -358, -358, -358, -358, -358, -358, + -358, 330, 331, 332, 335, 10, -358, -46, -49, -67, + 216, 787, 134, 213, 214, 212, 223, 134, 134, 134, + 134, 134, 134, 134, 210, 134, 134, 134, -4, 271, + -4, 134, 134, -4, 101, -4, -4, -4, -4, -4, + -4, -358, 524, -358, 524, -358, -358, -358, 344, 190, + -358, 169, 351, 352, 353, -358, 354, 358, 362, 355, + 99, -4, 648, 134, -358, 20, -358, -358, -73, 134, + 134, 134, 134, 134, 134, 134, 134, 134, 134, 68, + 368, 373, 375, 376, 377, 387, 388, 389, 390, 391, + 392, 393, 394, -358, -358, 397, 137, 134, 134, -358, + 169, 134, 325, 134, -358, 39, -358, -358, -358, -358, + -358, -358, -358, -358, -358, -358, -358, -358, -358, -358, + -358, 190, -358, -358, -358, -358, -358, -358, -358, 190, + 190, 190, 190, 190, 190, 190, -358, -358, 190, -358, + 395, -77, -358, 190, -358, -358, -358, 190, 190, -358, + -358, -358, -358, -358, -358, -358, -358, -358, -358, 134, + -358, 134, 134, 210, 160, 275, 145, 58, -358, -358, + -358, 190, -358, -358, -358, -358, -358, 28, 28, 7, + 7, 42, 184, 187, -358, 401, 402, 416, 419, 430, + 433, -358, -358, 435, -358, 301, -358, -358, -46, -49, + -67, 134, 134, -4, 101, -4, -4, -4, -4, -4, + -4, -358, 177, -358, 190, 190, -358, 190, -358, 190, + -358, 134, 170, -358, 190, 190, -358, 354, -358, -358, + -358, -358, -358, 355, 99, 134, 134, 134, 134, 327, + 134, 320, -358, -358, -358, -358, 190, -358, 442, -53, + -358, -358, -358, -358, -358, -358, -358, -358, -358, -358, + 257, -64, -358, 190, 190, 190, 190, -358, 190, -358, + 134, 183, -358, -358, -358, 306, -44, -358, -358 }; /* YYDEFACT[S] -- default reduction number in state S. Performed when @@ -1645,84 +1651,84 @@ BisonParser::yydefact_[] = { 3, 0, 2, 1, 5, 4, 0, 0, 7, 0, - 112, 6, 109, 0, 0, 0, 0, 0, 0, 69, - 0, 250, 251, 0, 0, 0, 228, 227, 229, 184, - 185, 186, 187, 188, 189, 182, 222, 230, 231, 232, - 233, 234, 224, 225, 226, 11, 12, 10, 47, 14, - 68, 9, 8, 13, 0, 183, 223, 111, 0, 0, - 0, 0, 73, 0, 0, 0, 0, 0, 0, 0, - 0, 49, 0, 67, 15, 0, 0, 0, 48, 109, - 70, 71, 0, 140, 149, 147, 148, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 155, 0, 0, 0, - 0, 0, 0, 217, 218, 0, 0, 0, 141, 142, - 143, 144, 145, 146, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 236, 151, 237, 150, 235, 222, 231, - 232, 233, 234, 224, 197, 181, 179, 0, 115, 114, - 131, 127, 175, 128, 154, 129, 130, 152, 153, 0, - 0, 0, 0, 0, 0, 0, 0, 125, 0, 207, - 0, 83, 85, 78, 253, 252, 0, 0, 0, 255, - 258, 262, 265, 268, 270, 272, 42, 43, 44, 51, - 41, 20, 198, 46, 106, 107, 108, 102, 0, 0, - 199, 200, 202, 203, 204, 205, 206, 201, 0, 87, - 95, 96, 104, 97, 98, 99, 101, 100, 0, 0, - 0, 0, 89, 45, 0, 0, 0, 0, 0, 0, + 113, 6, 110, 0, 0, 0, 0, 0, 0, 0, + 70, 0, 251, 252, 0, 0, 0, 229, 228, 230, + 185, 186, 187, 188, 189, 190, 183, 223, 231, 232, + 233, 234, 235, 225, 226, 227, 11, 12, 10, 48, + 14, 69, 9, 8, 13, 0, 184, 224, 112, 0, + 0, 0, 0, 74, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 50, 0, 68, 15, 0, 0, 0, + 49, 110, 71, 72, 0, 141, 150, 148, 149, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 156, 0, + 0, 0, 0, 0, 0, 218, 219, 0, 0, 0, + 142, 143, 144, 145, 146, 147, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 237, 152, 238, 151, 236, + 223, 232, 233, 234, 235, 225, 198, 182, 180, 0, + 116, 115, 132, 128, 176, 129, 155, 130, 131, 153, + 154, 0, 0, 0, 0, 0, 0, 0, 0, 126, + 47, 0, 208, 0, 84, 86, 79, 254, 253, 0, + 0, 0, 256, 259, 263, 266, 269, 271, 273, 42, + 43, 44, 52, 41, 20, 199, 46, 107, 108, 109, + 103, 0, 0, 200, 201, 203, 204, 205, 206, 207, + 202, 0, 88, 96, 97, 105, 98, 99, 100, 102, + 101, 0, 0, 0, 0, 90, 45, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 114, 0, 119, 0, 120, 78, 82, 137, 139, + 73, 0, 0, 0, 0, 242, 80, 0, 0, 81, + 0, 0, 0, 0, 77, 0, 257, 258, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 113, 0, - 118, 0, 119, 77, 81, 136, 138, 72, 0, 0, - 0, 0, 241, 79, 0, 0, 80, 0, 0, 0, - 0, 76, 0, 256, 257, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 69, 0, 0, 0, + 0, 0, 0, 35, 33, 0, 17, 0, 0, 76, + 0, 0, 0, 0, 83, 0, 92, 191, 192, 161, + 193, 194, 162, 195, 196, 163, 197, 164, 124, 123, + 155, 220, 210, 166, 209, 165, 211, 167, 157, 212, + 213, 214, 215, 216, 217, 174, 244, 173, 179, 133, + 135, 158, 134, 140, 221, 125, 222, 181, 122, 121, + 178, 168, 169, 170, 171, 172, 175, 117, 118, 0, + 75, 0, 0, 0, 0, 0, 0, 0, 177, 111, + 127, 87, 85, 255, 260, 261, 262, 264, 265, 267, + 268, 270, 272, 274, 51, 0, 0, 0, 0, 0, + 0, 61, 62, 0, 53, 56, 55, 54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 35, 33, 0, 17, 0, 0, 75, 0, 0, 0, - 0, 82, 0, 91, 190, 191, 160, 192, 193, 161, - 194, 195, 162, 196, 163, 123, 122, 154, 219, 209, - 165, 208, 164, 210, 166, 156, 211, 212, 213, 214, - 215, 216, 173, 243, 172, 178, 132, 134, 157, 133, - 139, 220, 124, 221, 180, 121, 120, 177, 167, 168, - 169, 170, 171, 174, 116, 117, 0, 74, 0, 0, - 0, 0, 0, 0, 0, 176, 110, 126, 86, 84, - 254, 259, 260, 261, 263, 264, 266, 267, 269, 271, - 273, 50, 0, 0, 0, 0, 0, 0, 60, 61, - 0, 52, 55, 54, 53, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 16, 20, - 19, 103, 105, 88, 92, 93, 94, 90, 0, 0, - 137, 238, 240, 239, 242, 247, 244, 248, 249, 245, - 246, 0, 0, 0, 0, 0, 0, 0, 0, 57, - 24, 21, 32, 31, 34, 36, 38, 30, 22, 23, - 25, 26, 27, 28, 29, 18, 135, 0, 0, 63, - 64, 65, 66, 58, 59, 62, 56, 0, 0, 159, - 158, 37, 0, 0, 40, 39 + 0, 16, 20, 19, 104, 106, 89, 93, 94, 95, + 91, 0, 0, 138, 239, 241, 240, 243, 248, 245, + 249, 250, 246, 247, 0, 0, 0, 0, 0, 0, + 0, 0, 58, 24, 21, 32, 31, 34, 36, 38, + 30, 22, 23, 25, 26, 27, 28, 29, 18, 136, + 0, 0, 64, 65, 66, 67, 59, 60, 63, 57, + 0, 0, 160, 159, 37, 0, 0, 40, 39 }; /* YYPGOTO[NTERM-NUM]. */ const short int BisonParser::yypgoto_[] = { - -380, -380, -380, -380, -380, -380, -380, -380, -290, -380, - -20, -380, -380, -380, 411, -380, -380, -379, -380, 173, - 441, -380, -380, 192, -380, -243, -203, -380, -380, -6, - -380, 456, -380, -117, -380, 197, -58, -380, 39, 102, - -380, -380, 268, -380, -380, -380, -380, 64, 79, 80, - -380, -212, -146, -380, -380, -380, -380, -380, -380, -380, - -380, -57, -380, -380, -380, -380, -380, 475, -380, -380, - 118, 120, 117, -380, -380, -63, -380, -87, -67, -64, - 212, 259, 207, -68 + -358, -358, -358, -358, -358, -358, -358, -358, -297, -358, + -38, -358, -358, -358, 408, -358, -358, -357, -358, 172, + 438, -358, -358, 188, -358, -241, -208, -358, -358, -6, + -358, 450, -358, -124, -358, 192, -60, -358, 29, 93, + -358, -358, 244, -358, -358, -358, -358, 59, 57, 61, + -358, -57, -148, -358, -358, -358, -358, -358, -358, -358, + -358, -61, -358, -358, -358, -358, -358, 460, -358, -358, + 96, 100, 95, -358, -358, -65, -358, -89, -78, -76, + 189, 193, 194, -70 }; /* YYDEFGOTO[NTERM-NUM]. */ const short int BisonParser::yydefgoto_[] = { - -1, 1, 2, 5, 6, 9, 45, 181, 302, 303, - 454, 455, 46, 47, 48, 179, 286, 401, 402, 49, - 50, 51, 152, 160, 161, 198, 211, 212, 199, 80, - 65, 81, 58, 137, 138, 156, 139, 140, 346, 254, - 255, 349, 141, 142, 347, 143, 54, 316, 319, 322, - 324, 144, 183, 200, 201, 202, 203, 204, 205, 206, - 207, 162, 332, 330, 334, 145, 146, 147, 56, 148, - 263, 344, 266, 436, 439, 57, 169, 170, 171, 172, - 173, 174, 175, 256 + -1, 1, 2, 5, 6, 9, 46, 184, 305, 306, + 457, 458, 47, 48, 49, 182, 289, 404, 405, 50, + 51, 52, 154, 163, 164, 201, 214, 215, 202, 82, + 66, 83, 59, 139, 140, 158, 141, 142, 349, 257, + 258, 352, 143, 144, 350, 145, 55, 319, 322, 325, + 327, 146, 186, 203, 204, 205, 206, 207, 208, 209, + 210, 165, 335, 333, 337, 147, 148, 149, 57, 150, + 266, 347, 269, 439, 442, 58, 172, 173, 174, 175, + 176, 177, 178, 259 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1732,188 +1738,194 @@ const unsigned short int BisonParser::yytable_[] = { - 176, 177, 178, 52, 180, 257, 327, 157, 158, 313, - 163, 320, 3, 420, 4, 367, 164, 165, 249, 213, - 8, 250, 252, 449, 208, 83, 84, 85, 86, 87, - 88, 89, 90, 91, 92, 7, 93, 94, 314, 95, - 96, 97, 98, 99, 100, 101, 102, 103, 104, 321, - 105, 106, 68, 107, 312, 375, 108, 109, 110, 111, - 112, 113, 114, 115, 423, 116, 117, 118, 10, 476, - 119, 209, 210, 317, 315, 79, 285, 69, 166, 273, - 274, 120, 167, 168, 70, 467, 285, 121, 380, 208, - 285, 71, 253, 285, 285, 357, 122, 72, 480, 74, - 275, 75, 485, 76, 429, 478, 26, 27, 28, 427, - 318, 66, 159, 77, 67, 123, 124, 125, 126, 127, - 128, 37, 129, 130, 131, 132, 133, 43, 44, 465, - 21, 22, 364, 134, 365, 17, 209, 210, 59, 135, - 82, 419, 149, 21, 22, 276, 277, 278, 136, 279, - 280, 328, 287, 288, 289, 150, 336, 337, 338, 339, - 340, 341, 342, 151, 345, 348, 350, 60, 281, 282, - 354, 355, 351, 153, 353, 154, 290, 356, 182, 358, - 359, 360, 361, 362, 363, 291, 264, 265, 292, 381, - 382, 383, 287, 288, 289, 259, 260, 261, 262, 61, - 62, 63, 378, 437, 438, 376, 159, 64, 164, 165, - 214, 157, 384, 385, 215, 216, 290, 386, 387, 293, - 217, 218, 219, 220, 221, 291, 222, 223, 292, 469, - 224, 225, 184, 185, 186, 226, 421, 422, 227, 228, - 424, 229, 426, 294, 230, 295, 296, 297, 298, 299, - 231, 232, 391, 233, 258, 234, 235, 236, 79, 293, - 187, 188, 300, 189, 237, 458, 238, 239, 392, 448, - 166, 301, 240, 241, 167, 168, 242, 482, 243, 244, - 404, 245, 246, 294, 392, 295, 296, 297, 298, 299, - 247, 248, 267, 190, 191, 192, 193, 194, 195, 196, - 431, 432, 300, 164, 165, 268, 197, 269, 271, 270, - 272, 301, 393, 394, 395, 284, 396, 397, 398, 399, - 400, 19, 283, 285, 304, 305, 21, 22, 393, 394, - 395, 306, 396, 397, 398, 399, 400, 307, 311, 308, - 453, 456, 309, 310, 331, 323, 343, 457, 366, 459, - 460, 461, 462, 463, 464, 333, 352, 329, 368, 369, - 348, 468, 370, 335, 371, 166, 372, 373, 374, 167, - 168, 405, 134, 251, 470, 471, 472, 473, 406, 475, - 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, - 418, 93, 94, 407, 95, 96, 97, 98, 99, 100, - 101, 102, 103, 104, 392, 105, 106, 408, 107, 456, - 483, 108, 109, 110, 111, 112, 113, 114, 115, 409, - 116, 117, 118, 410, 411, 119, 412, 413, 414, 415, - 416, 417, 435, 441, 425, 428, 120, 442, 443, 444, - 445, 446, 121, 447, 479, 474, 484, 477, 393, 394, - 395, 122, 396, 397, 398, 399, 400, 481, 78, 403, - 73, 26, 27, 28, 379, 53, 377, 466, 430, 450, - 123, 124, 125, 126, 127, 128, 37, 129, 130, 131, - 132, 133, 43, 44, 55, 451, 326, 452, 134, 434, - 433, 440, 390, 0, 135, 388, 0, 0, 0, 0, - 0, 0, 0, 136, 83, 84, 85, 86, 87, 88, - 89, 90, 91, 92, 0, 93, 94, 0, 95, 96, - 97, 98, 99, 100, 101, 102, 103, 104, 0, 105, - 106, 0, 107, 0, 0, 108, 109, 110, 111, 112, - 113, 114, 115, 389, 116, 117, 118, 0, 0, 119, + 179, 180, 181, 53, 183, 260, 159, 316, 166, 423, + 160, 10, 3, 323, 252, 315, 253, 255, 81, 216, + 370, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 320, 95, 96, 317, 97, 98, 99, 100, 101, + 102, 103, 104, 105, 106, 161, 107, 108, 452, 109, + 211, 324, 110, 111, 112, 113, 114, 115, 116, 117, + 288, 118, 119, 120, 288, 4, 121, 7, 321, 426, + 318, 432, 394, 288, 22, 23, 383, 122, 81, 211, + 276, 277, 8, 123, 288, 483, 22, 23, 395, 67, + 256, 70, 124, 288, 479, 481, 360, 212, 213, 267, + 268, 278, 27, 28, 29, 488, 68, 430, 71, 69, + 72, 125, 126, 127, 128, 129, 130, 38, 131, 132, + 133, 134, 135, 44, 45, 468, 212, 213, 367, 136, + 368, 73, 396, 397, 398, 137, 399, 400, 401, 402, + 403, 20, 422, 76, 138, 74, 22, 23, 77, 162, + 282, 283, 331, 290, 291, 292, 78, 339, 340, 341, + 342, 343, 344, 345, 330, 348, 351, 353, 279, 280, + 281, 357, 358, 354, 79, 356, 18, 293, 359, 84, + 361, 362, 363, 364, 365, 366, 294, 284, 285, 295, + 384, 385, 386, 290, 291, 292, 262, 263, 264, 265, + 440, 441, 151, 381, 387, 388, 379, 60, 389, 390, + 152, 153, 159, 378, 155, 167, 168, 293, 156, 136, + 296, 162, 185, 217, 218, 219, 294, 220, 221, 295, + 187, 188, 189, 222, 223, 224, 61, 424, 425, 225, + 226, 427, 227, 429, 297, 228, 298, 299, 300, 301, + 302, 167, 168, 229, 230, 231, 232, 233, 190, 191, + 296, 192, 234, 303, 167, 168, 461, 235, 62, 63, + 64, 236, 304, 237, 238, 239, 65, 169, 240, 241, + 242, 170, 171, 407, 297, 243, 298, 299, 300, 301, + 302, 193, 194, 195, 196, 197, 198, 199, 244, 245, + 246, 434, 435, 303, 200, 247, 451, 261, 248, 249, + 250, 251, 304, 169, 270, 272, 271, 170, 171, 273, + 470, 395, 274, 286, 275, 287, 169, 288, 307, 308, + 170, 171, 309, 485, 310, 326, 311, 312, 313, 314, + 395, 456, 459, 332, 336, 334, 346, 355, 460, 369, + 462, 463, 464, 465, 466, 467, 338, 371, 372, 373, + 377, 351, 471, 374, 375, 396, 397, 398, 376, 399, + 400, 401, 402, 403, 408, 473, 474, 475, 476, 409, + 478, 410, 411, 412, 396, 397, 398, 472, 399, 400, + 401, 402, 403, 413, 414, 415, 416, 417, 418, 419, + 420, 421, 428, 477, 431, 254, 482, 444, 445, 438, + 459, 486, 85, 86, 87, 88, 89, 90, 91, 92, + 93, 94, 446, 95, 96, 447, 97, 98, 99, 100, + 101, 102, 103, 104, 105, 106, 448, 107, 108, 449, + 109, 450, 484, 110, 111, 112, 113, 114, 115, 116, + 117, 480, 118, 119, 120, 487, 80, 121, 75, 54, + 469, 406, 433, 382, 380, 329, 454, 453, 122, 56, + 437, 455, 443, 436, 123, 391, 0, 0, 0, 0, + 392, 0, 393, 124, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 27, 28, 29, 0, 0, 0, 0, + 0, 0, 125, 126, 127, 128, 129, 130, 38, 131, + 132, 133, 134, 135, 44, 45, 0, 0, 0, 0, + 136, 0, 0, 0, 0, 0, 137, 0, 0, 0, + 0, 0, 0, 0, 0, 138, 85, 86, 87, 88, + 89, 90, 91, 92, 93, 94, 0, 95, 96, 0, + 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, + 0, 107, 108, 0, 109, 0, 0, 110, 111, 112, + 113, 114, 115, 116, 117, 0, 118, 119, 120, 0, + 0, 121, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 122, 0, 0, 0, 0, 0, 123, 0, + 0, 0, 0, 0, 0, 0, 0, 124, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 27, 28, 29, + 0, 0, 0, 0, 0, 0, 125, 126, 127, 128, + 129, 130, 38, 131, 132, 133, 134, 135, 44, 45, + 0, 0, 0, 0, 136, 0, 0, 0, 0, 0, + 137, 0, 0, 0, 0, 0, 0, 0, 0, 138, + 85, 86, 87, 88, 89, 90, 91, 92, 157, 94, + 0, 95, 96, 0, 97, 98, 99, 100, 101, 102, + 103, 104, 105, 106, 0, 107, 108, 0, 109, 0, + 0, 110, 111, 112, 113, 114, 115, 116, 117, 0, + 118, 0, 120, 0, 0, 121, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 10, 11, 0, 0, 0, + 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, + 0, 124, 13, 0, 14, 0, 0, 0, 0, 0, + 0, 27, 28, 29, 0, 0, 0, 0, 0, 0, + 125, 126, 127, 128, 129, 130, 38, 131, 132, 133, + 134, 135, 44, 45, 0, 0, 0, 0, 136, 0, + 15, 16, 17, 0, 137, 0, 0, 0, 0, 18, + 19, 0, 0, 138, 0, 20, 0, 21, 0, 0, + 22, 23, 0, 0, 0, 24, 25, 0, 26, 85, + 86, 87, 88, 0, 0, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 0, 0, 0, 36, 0, 37, + 38, 39, 40, 41, 42, 43, 44, 45, 0, 0, + 110, 111, 112, 113, 114, 115, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 120, 0, 0, 0, 0, 0, 121, 0, 0, 0, - 0, 0, 0, 0, 0, 122, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 26, 27, 28, 0, 0, - 0, 0, 0, 0, 123, 124, 125, 126, 127, 128, - 37, 129, 130, 131, 132, 133, 43, 44, 0, 0, - 0, 0, 134, 0, 0, 0, 0, 0, 135, 0, - 0, 0, 0, 0, 0, 0, 0, 136, 83, 84, - 85, 86, 87, 88, 89, 90, 155, 92, 0, 93, - 94, 0, 95, 96, 97, 98, 99, 100, 101, 102, - 103, 104, 0, 105, 106, 0, 107, 0, 0, 108, - 109, 110, 111, 112, 113, 114, 115, 0, 116, 0, - 118, 0, 0, 119, 0, 0, 0, 0, 0, 0, - 0, 0, 10, 11, 0, 0, 0, 0, 0, 12, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 122, - 0, 13, 0, 0, 0, 0, 0, 0, 0, 26, - 27, 28, 0, 0, 0, 0, 0, 0, 123, 124, - 125, 126, 127, 128, 37, 129, 130, 131, 132, 133, - 43, 44, 0, 0, 0, 0, 134, 14, 15, 16, - 0, 0, 135, 0, 0, 0, 17, 18, 0, 0, - 0, 136, 19, 0, 20, 0, 0, 21, 22, 0, - 0, 0, 23, 24, 0, 25, 83, 84, 85, 86, - 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 0, 0, 0, 35, 0, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 0, 0, 108, 109, 110, - 111, 112, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 26, 27, 28, - 0, 0, 0, 0, 0, 0, 325, 124, 125, 126, - 127, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 0, 0, 0, 0, 134 + 27, 28, 29, 0, 0, 0, 0, 0, 0, 328, + 126, 127, 128, 129, 37, 38, 39, 40, 41, 42, + 43, 44, 45, 0, 0, 0, 0, 136 }; /* YYCHECK. */ const short int BisonParser::yycheck_[] = { - 68, 69, 70, 9, 72, 151, 218, 65, 25, 212, - 67, 80, 0, 303, 76, 258, 81, 82, 5, 82, - 3, 138, 139, 402, 40, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 7, 23, 24, 80, 26, - 27, 28, 29, 30, 31, 32, 33, 34, 35, 118, - 37, 38, 6, 40, 5, 267, 43, 44, 45, 46, - 47, 48, 49, 50, 307, 52, 53, 54, 3, 448, - 57, 87, 88, 80, 116, 10, 137, 6, 143, 166, - 167, 68, 147, 148, 6, 150, 137, 74, 149, 40, - 137, 3, 149, 137, 137, 241, 83, 6, 149, 3, - 168, 6, 149, 3, 148, 148, 93, 94, 95, 312, - 117, 3, 129, 3, 6, 102, 103, 104, 105, 106, - 107, 108, 109, 110, 111, 112, 113, 114, 115, 419, - 78, 79, 249, 120, 251, 67, 87, 88, 22, 126, - 6, 5, 11, 78, 79, 140, 141, 142, 135, 143, - 144, 219, 16, 17, 18, 11, 224, 225, 226, 227, - 228, 229, 230, 11, 232, 233, 234, 51, 145, 146, - 238, 239, 235, 11, 237, 11, 40, 240, 121, 242, - 243, 244, 245, 246, 247, 49, 41, 42, 52, 276, - 277, 278, 16, 17, 18, 36, 37, 38, 39, 83, - 84, 85, 270, 55, 56, 268, 129, 91, 81, 82, - 6, 269, 279, 280, 6, 6, 40, 281, 282, 83, - 6, 6, 6, 6, 6, 49, 6, 6, 52, 441, - 6, 6, 61, 62, 63, 6, 304, 305, 6, 6, - 308, 6, 310, 107, 6, 109, 110, 111, 112, 113, - 6, 6, 4, 6, 11, 6, 6, 6, 10, 83, - 89, 90, 126, 92, 6, 411, 6, 6, 20, 5, - 143, 135, 6, 6, 147, 148, 6, 150, 6, 6, - 286, 6, 6, 107, 20, 109, 110, 111, 112, 113, - 6, 4, 6, 122, 123, 124, 125, 126, 127, 128, - 368, 369, 126, 81, 82, 11, 135, 5, 4, 6, - 5, 135, 64, 65, 66, 138, 68, 69, 70, 71, - 72, 73, 139, 137, 6, 6, 78, 79, 64, 65, - 66, 4, 68, 69, 70, 71, 72, 5, 4, 6, - 408, 409, 6, 6, 131, 119, 136, 410, 5, 412, - 413, 414, 415, 416, 417, 132, 76, 130, 6, 6, - 428, 429, 6, 133, 9, 143, 6, 6, 5, 147, - 148, 6, 120, 5, 442, 443, 444, 445, 6, 447, + 70, 71, 72, 9, 74, 153, 66, 215, 69, 306, + 67, 3, 0, 80, 5, 5, 140, 141, 10, 84, + 261, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 80, 23, 24, 80, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 25, 37, 38, 405, 40, + 40, 118, 43, 44, 45, 46, 47, 48, 49, 50, + 137, 52, 53, 54, 137, 76, 57, 7, 117, 310, + 116, 148, 4, 137, 78, 79, 149, 68, 10, 40, + 169, 170, 3, 74, 137, 149, 78, 79, 20, 6, + 151, 6, 83, 137, 451, 148, 244, 87, 88, 41, + 42, 171, 93, 94, 95, 149, 3, 315, 6, 6, + 6, 102, 103, 104, 105, 106, 107, 108, 109, 110, + 111, 112, 113, 114, 115, 422, 87, 88, 252, 120, + 254, 3, 64, 65, 66, 126, 68, 69, 70, 71, + 72, 73, 5, 3, 135, 6, 78, 79, 6, 129, + 143, 144, 222, 16, 17, 18, 3, 227, 228, 229, + 230, 231, 232, 233, 221, 235, 236, 237, 140, 141, + 142, 241, 242, 238, 3, 240, 67, 40, 243, 6, + 245, 246, 247, 248, 249, 250, 49, 145, 146, 52, + 279, 280, 281, 16, 17, 18, 36, 37, 38, 39, + 55, 56, 11, 273, 282, 283, 271, 22, 284, 285, + 11, 11, 272, 270, 11, 81, 82, 40, 11, 120, + 83, 129, 121, 6, 6, 6, 49, 6, 6, 52, + 61, 62, 63, 6, 6, 6, 51, 307, 308, 6, + 6, 311, 6, 313, 107, 6, 109, 110, 111, 112, + 113, 81, 82, 6, 6, 6, 6, 6, 89, 90, + 83, 92, 6, 126, 81, 82, 414, 6, 83, 84, + 85, 6, 135, 6, 6, 6, 91, 143, 6, 6, + 6, 147, 148, 289, 107, 6, 109, 110, 111, 112, + 113, 122, 123, 124, 125, 126, 127, 128, 6, 6, + 6, 371, 372, 126, 135, 6, 5, 11, 6, 6, + 6, 4, 135, 143, 6, 5, 11, 147, 148, 6, + 150, 20, 4, 139, 5, 138, 143, 137, 6, 6, + 147, 148, 4, 150, 5, 119, 6, 6, 6, 4, + 20, 411, 412, 130, 132, 131, 136, 76, 413, 5, + 415, 416, 417, 418, 419, 420, 133, 6, 6, 6, + 5, 431, 432, 9, 6, 64, 65, 66, 6, 68, + 69, 70, 71, 72, 6, 445, 446, 447, 448, 6, + 450, 6, 6, 6, 64, 65, 66, 444, 68, 69, + 70, 71, 72, 6, 6, 6, 6, 6, 6, 6, + 6, 4, 77, 76, 9, 5, 149, 6, 6, 134, + 480, 481, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 6, 23, 24, 6, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, 6, 37, 38, 6, + 40, 6, 480, 43, 44, 45, 46, 47, 48, 49, + 50, 9, 52, 53, 54, 149, 48, 57, 20, 9, + 431, 289, 369, 275, 272, 221, 409, 408, 68, 9, + 374, 410, 377, 373, 74, 286, -1, -1, -1, -1, + 287, -1, 288, 83, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 93, 94, 95, -1, -1, -1, -1, + -1, -1, 102, 103, 104, 105, 106, 107, 108, 109, + 110, 111, 112, 113, 114, 115, -1, -1, -1, -1, + 120, -1, -1, -1, -1, -1, 126, -1, -1, -1, + -1, -1, -1, -1, -1, 135, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, -1, 23, 24, -1, + 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + -1, 37, 38, -1, 40, -1, -1, 43, 44, 45, + 46, 47, 48, 49, 50, -1, 52, 53, 54, -1, + -1, 57, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 68, -1, -1, -1, -1, -1, 74, -1, + -1, -1, -1, -1, -1, -1, -1, 83, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 93, 94, 95, + -1, -1, -1, -1, -1, -1, 102, 103, 104, 105, + 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, + -1, -1, -1, -1, 120, -1, -1, -1, -1, -1, + 126, -1, -1, -1, -1, -1, -1, -1, -1, 135, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 4, 23, 24, 6, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 20, 37, 38, 6, 40, 477, - 478, 43, 44, 45, 46, 47, 48, 49, 50, 6, - 52, 53, 54, 6, 6, 57, 6, 6, 6, 6, - 6, 6, 134, 6, 77, 9, 68, 6, 6, 6, - 6, 6, 74, 6, 149, 76, 149, 9, 64, 65, - 66, 83, 68, 69, 70, 71, 72, 477, 47, 286, - 19, 93, 94, 95, 272, 9, 269, 428, 366, 405, + -1, 23, 24, -1, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, -1, 37, 38, -1, 40, -1, + -1, 43, 44, 45, 46, 47, 48, 49, 50, -1, + 52, -1, 54, -1, -1, 57, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 3, 4, -1, -1, -1, + -1, -1, 10, -1, -1, -1, -1, -1, -1, -1, + -1, 83, 20, -1, 22, -1, -1, -1, -1, -1, + -1, 93, 94, 95, -1, -1, -1, -1, -1, -1, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, - 112, 113, 114, 115, 9, 406, 218, 407, 120, 371, - 370, 374, 285, -1, 126, 283, -1, -1, -1, -1, - -1, -1, -1, 135, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, -1, 23, 24, -1, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, -1, 37, - 38, -1, 40, -1, -1, 43, 44, 45, 46, 47, - 48, 49, 50, 284, 52, 53, 54, -1, -1, 57, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 68, -1, -1, -1, -1, -1, 74, -1, -1, -1, - -1, -1, -1, -1, -1, 83, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 93, 94, 95, -1, -1, - -1, -1, -1, -1, 102, 103, 104, 105, 106, 107, + 112, 113, 114, 115, -1, -1, -1, -1, 120, -1, + 58, 59, 60, -1, 126, -1, -1, -1, -1, 67, + 68, -1, -1, 135, -1, 73, -1, 75, -1, -1, + 78, 79, -1, -1, -1, 83, 84, -1, 86, 12, + 13, 14, 15, -1, -1, 93, 94, 95, 96, 97, + 98, 99, 100, 101, -1, -1, -1, 105, -1, 107, 108, 109, 110, 111, 112, 113, 114, 115, -1, -1, - -1, -1, 120, -1, -1, -1, -1, -1, 126, -1, - -1, -1, -1, -1, -1, -1, -1, 135, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, - 24, -1, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, -1, 37, 38, -1, 40, -1, -1, 43, - 44, 45, 46, 47, 48, 49, 50, -1, 52, -1, - 54, -1, -1, 57, -1, -1, -1, -1, -1, -1, - -1, -1, 3, 4, -1, -1, -1, -1, -1, 10, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 83, - -1, 22, -1, -1, -1, -1, -1, -1, -1, 93, - 94, 95, -1, -1, -1, -1, -1, -1, 102, 103, - 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, - 114, 115, -1, -1, -1, -1, 120, 58, 59, 60, - -1, -1, 126, -1, -1, -1, 67, 68, -1, -1, - -1, 135, 73, -1, 75, -1, -1, 78, 79, -1, - -1, -1, 83, 84, -1, 86, 12, 13, 14, 15, - -1, -1, 93, 94, 95, 96, 97, 98, 99, 100, - 101, -1, -1, -1, 105, -1, 107, 108, 109, 110, - 111, 112, 113, 114, 115, -1, -1, 43, 44, 45, - 46, 47, 48, -1, -1, -1, -1, -1, -1, -1, + 43, 44, 45, 46, 47, 48, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 93, 94, 95, - -1, -1, -1, -1, -1, -1, 102, 103, 104, 105, - 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, - -1, -1, -1, -1, 120 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 93, 94, 95, -1, -1, -1, -1, -1, -1, 102, + 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, + 113, 114, 115, -1, -1, -1, -1, 120 }; /* STOS_[STATE-NUM] -- The (internal number of the) accessing @@ -1922,54 +1934,54 @@ BisonParser::yystos_[] = { 0, 152, 153, 0, 76, 154, 155, 7, 3, 156, - 3, 4, 10, 22, 58, 59, 60, 67, 68, 73, - 75, 78, 79, 83, 84, 86, 93, 94, 95, 96, - 97, 98, 99, 100, 101, 105, 107, 108, 109, 110, - 111, 112, 113, 114, 115, 157, 163, 164, 165, 170, - 171, 172, 180, 182, 197, 218, 219, 226, 183, 22, - 51, 83, 84, 85, 91, 181, 3, 6, 6, 6, - 6, 3, 6, 171, 3, 6, 3, 3, 165, 10, - 180, 182, 6, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 21, 23, 24, 26, 27, 28, 29, 30, - 31, 32, 33, 34, 35, 37, 38, 40, 43, 44, - 45, 46, 47, 48, 49, 50, 52, 53, 54, 57, - 68, 74, 83, 102, 103, 104, 105, 106, 107, 109, - 110, 111, 112, 113, 120, 126, 135, 184, 185, 187, - 188, 193, 194, 196, 202, 216, 217, 218, 220, 11, - 11, 11, 173, 11, 11, 20, 186, 187, 25, 129, - 174, 175, 212, 212, 81, 82, 143, 147, 148, 227, - 228, 229, 230, 231, 232, 233, 234, 234, 234, 166, - 234, 158, 121, 203, 61, 62, 63, 89, 90, 92, - 122, 123, 124, 125, 126, 127, 128, 135, 176, 179, - 204, 205, 206, 207, 208, 209, 210, 211, 40, 87, - 88, 177, 178, 226, 6, 6, 6, 6, 6, 6, + 3, 4, 10, 20, 22, 58, 59, 60, 67, 68, + 73, 75, 78, 79, 83, 84, 86, 93, 94, 95, + 96, 97, 98, 99, 100, 101, 105, 107, 108, 109, + 110, 111, 112, 113, 114, 115, 157, 163, 164, 165, + 170, 171, 172, 180, 182, 197, 218, 219, 226, 183, + 22, 51, 83, 84, 85, 91, 181, 6, 3, 6, + 6, 6, 6, 3, 6, 171, 3, 6, 3, 3, + 165, 10, 180, 182, 6, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 23, 24, 26, 27, 28, + 29, 30, 31, 32, 33, 34, 35, 37, 38, 40, + 43, 44, 45, 46, 47, 48, 49, 50, 52, 53, + 54, 57, 68, 74, 83, 102, 103, 104, 105, 106, + 107, 109, 110, 111, 112, 113, 120, 126, 135, 184, + 185, 187, 188, 193, 194, 196, 202, 216, 217, 218, + 220, 11, 11, 11, 173, 11, 11, 20, 186, 187, + 202, 25, 129, 174, 175, 212, 212, 81, 82, 143, + 147, 148, 227, 228, 229, 230, 231, 232, 233, 234, + 234, 234, 166, 234, 158, 121, 203, 61, 62, 63, + 89, 90, 92, 122, 123, 124, 125, 126, 127, 128, + 135, 176, 179, 204, 205, 206, 207, 208, 209, 210, + 211, 40, 87, 88, 177, 178, 226, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 4, 5, - 184, 5, 184, 212, 190, 191, 234, 203, 11, 36, - 37, 38, 39, 221, 41, 42, 223, 6, 11, 5, - 6, 4, 5, 228, 228, 234, 140, 141, 142, 143, - 144, 145, 146, 139, 138, 137, 167, 16, 17, 18, - 40, 49, 52, 83, 107, 109, 110, 111, 112, 113, - 126, 135, 159, 160, 6, 6, 4, 5, 6, 6, - 6, 4, 5, 177, 80, 116, 198, 80, 117, 199, - 80, 118, 200, 119, 201, 102, 193, 202, 234, 130, - 214, 131, 213, 132, 215, 133, 234, 234, 234, 234, - 234, 234, 234, 136, 222, 234, 189, 195, 234, 192, - 234, 226, 76, 226, 234, 234, 226, 203, 226, 226, - 226, 226, 226, 226, 184, 184, 5, 176, 6, 6, - 6, 9, 6, 6, 5, 202, 226, 186, 234, 174, - 149, 228, 228, 228, 229, 229, 230, 230, 231, 232, - 233, 4, 20, 64, 65, 66, 68, 69, 70, 71, - 72, 168, 169, 170, 180, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 4, 5, - 159, 234, 234, 176, 234, 77, 234, 177, 9, 148, - 190, 234, 234, 222, 221, 134, 224, 55, 56, 225, - 223, 6, 6, 6, 6, 6, 6, 6, 5, 168, - 198, 199, 200, 234, 161, 162, 234, 226, 203, 226, - 226, 226, 226, 226, 226, 159, 189, 150, 234, 202, - 234, 234, 234, 234, 76, 234, 168, 9, 148, 149, - 149, 161, 150, 234, 149, 149 + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 4, 5, 184, 5, 184, 212, 190, 191, 234, + 203, 11, 36, 37, 38, 39, 221, 41, 42, 223, + 6, 11, 5, 6, 4, 5, 228, 228, 234, 140, + 141, 142, 143, 144, 145, 146, 139, 138, 137, 167, + 16, 17, 18, 40, 49, 52, 83, 107, 109, 110, + 111, 112, 113, 126, 135, 159, 160, 6, 6, 4, + 5, 6, 6, 6, 4, 5, 177, 80, 116, 198, + 80, 117, 199, 80, 118, 200, 119, 201, 102, 193, + 202, 234, 130, 214, 131, 213, 132, 215, 133, 234, + 234, 234, 234, 234, 234, 234, 136, 222, 234, 189, + 195, 234, 192, 234, 226, 76, 226, 234, 234, 226, + 203, 226, 226, 226, 226, 226, 226, 184, 184, 5, + 176, 6, 6, 6, 9, 6, 6, 5, 202, 226, + 186, 234, 174, 149, 228, 228, 228, 229, 229, 230, + 230, 231, 232, 233, 4, 20, 64, 65, 66, 68, + 69, 70, 71, 72, 168, 169, 170, 180, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 4, 5, 159, 234, 234, 176, 234, 77, 234, + 177, 9, 148, 190, 234, 234, 222, 221, 134, 224, + 55, 56, 225, 223, 6, 6, 6, 6, 6, 6, + 6, 5, 168, 198, 199, 200, 234, 161, 162, 234, + 226, 203, 226, 226, 226, 226, 226, 226, 159, 189, + 150, 234, 202, 234, 234, 234, 234, 76, 234, 168, + 9, 148, 149, 149, 161, 150, 234, 149, 149 }; #if YYDEBUG @@ -2005,30 +2017,30 @@ 156, 156, 156, 156, 156, 158, 157, 159, 159, 159, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 161, 161, 162, 162, - 162, 163, 163, 163, 163, 163, 163, 164, 164, 166, - 165, 167, 167, 167, 167, 168, 168, 168, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 170, 170, 171, - 171, 171, 172, 173, 172, 172, 172, 172, 172, 172, - 172, 172, 172, 174, 174, 175, 175, 176, 176, 177, - 177, 177, 178, 178, 178, 179, 179, 179, 179, 179, - 179, 179, 179, 179, 179, 179, 179, 179, 179, 181, - 180, 180, 183, 182, 184, 184, 184, 184, 184, 184, - 185, 185, 185, 185, 185, 186, 186, 187, 187, 187, - 187, 187, 188, 188, 189, 189, 190, 190, 191, 192, - 193, 193, 193, 193, 193, 193, 193, 193, 193, 193, - 193, 193, 193, 193, 193, 194, 194, 195, 195, 195, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, + 162, 163, 163, 163, 163, 163, 163, 163, 164, 164, + 166, 165, 167, 167, 167, 167, 168, 168, 168, 169, + 169, 169, 169, 169, 169, 169, 169, 169, 170, 170, + 171, 171, 171, 172, 173, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 174, 174, 175, 175, 176, 176, + 177, 177, 177, 178, 178, 178, 179, 179, 179, 179, + 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, + 181, 180, 180, 183, 182, 184, 184, 184, 184, 184, + 184, 185, 185, 185, 185, 185, 186, 186, 187, 187, + 187, 187, 187, 188, 188, 189, 189, 190, 190, 191, + 192, 193, 193, 193, 193, 193, 193, 193, 193, 193, + 193, 193, 193, 193, 193, 193, 194, 194, 195, 195, + 195, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 197, 197, 197, 197, 197, 197, 197, 197, - 198, 198, 199, 199, 200, 200, 201, 202, 203, 204, - 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, - 215, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 217, 217, 218, 218, 218, 218, 218, 218, 218, 218, - 218, 219, 219, 219, 219, 220, 220, 220, 221, 221, - 221, 221, 221, 222, 223, 223, 223, 224, 225, 225, - 226, 226, 227, 227, 227, 228, 228, 228, 229, 229, - 229, 229, 230, 230, 230, 231, 231, 231, 232, 232, - 233, 233, 234, 234 + 196, 196, 196, 197, 197, 197, 197, 197, 197, 197, + 197, 198, 198, 199, 199, 200, 200, 201, 202, 203, + 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, + 214, 215, 216, 216, 216, 216, 216, 216, 216, 216, + 216, 217, 217, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 219, 219, 219, 219, 220, 220, 220, 221, + 221, 221, 221, 221, 222, 223, 223, 223, 224, 225, + 225, 226, 226, 227, 227, 227, 228, 228, 228, 229, + 229, 229, 229, 230, 230, 230, 231, 231, 231, 232, + 232, 233, 233, 234, 234 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -2039,30 +2051,30 @@ 2, 2, 2, 2, 2, 0, 5, 1, 3, 2, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 3, 1, 1, 3, 1, 4, - 4, 3, 3, 3, 3, 3, 3, 1, 2, 0, - 5, 0, 2, 2, 2, 1, 3, 2, 3, 3, - 1, 1, 3, 3, 3, 3, 3, 2, 1, 0, - 2, 2, 4, 0, 5, 4, 4, 4, 3, 4, - 4, 4, 4, 1, 3, 1, 3, 1, 3, 1, - 3, 2, 3, 3, 3, 1, 1, 1, 1, 1, - 1, 1, 1, 3, 1, 3, 1, 1, 1, 0, - 5, 1, 0, 4, 1, 1, 3, 3, 2, 2, - 3, 3, 3, 3, 3, 1, 3, 1, 1, 1, - 1, 1, 3, 3, 1, 3, 1, 3, 1, 1, + 4, 3, 3, 3, 3, 3, 3, 3, 1, 2, + 0, 5, 0, 2, 2, 2, 1, 3, 2, 3, + 3, 1, 1, 3, 3, 3, 3, 3, 2, 1, + 0, 2, 2, 4, 0, 5, 4, 4, 4, 3, + 4, 4, 4, 4, 1, 3, 1, 3, 1, 3, + 1, 3, 2, 3, 3, 3, 1, 1, 1, 1, + 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, + 0, 5, 1, 0, 4, 1, 1, 3, 3, 2, + 2, 3, 3, 3, 3, 3, 1, 3, 1, 1, + 1, 1, 1, 3, 3, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 3, 1, 4, 4, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 1, 3, 3, 3, 1, - 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 3, 1, 4, + 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 1, 3, 3, 3, + 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 3, 3, 3, 3, 3, 3, 1, 1, 3, - 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, - 3, 1, 3, 1, 3, 3, 3, 1, 1, 1, - 1, 1, 1, 1, 3, 1, 2, 2, 1, 3, - 3, 3, 1, 3, 3, 1, 3, 3, 1, 3, - 1, 3, 1, 3 + 1, 1, 3, 3, 3, 3, 3, 3, 1, 1, + 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, + 3, 3, 1, 3, 1, 3, 3, 3, 1, 1, + 1, 1, 1, 1, 1, 3, 1, 2, 2, 1, + 3, 3, 3, 1, 3, 3, 1, 3, 3, 1, + 3, 1, 3, 1, 3 }; #if YYDEBUG @@ -2142,73 +2154,73 @@ 234, 148, 234, 149, -1, 234, 148, 150, 149, -1, 68, 6, 234, -1, 58, 6, 234, -1, 59, 6, 234, -1, 60, 6, 234, -1, 197, 6, 226, -1, - 83, 6, 203, -1, 165, -1, 164, 165, -1, -1, - 67, 3, 166, 167, 4, -1, -1, 167, 168, -1, - 167, 180, -1, 167, 170, -1, 169, -1, 169, 5, - 168, -1, 169, 168, -1, 68, 6, 234, -1, 69, - 6, 76, -1, 70, -1, 71, -1, 72, 6, 234, - -1, 20, 6, 202, -1, 64, 6, 234, -1, 65, - 6, 234, -1, 66, 6, 234, -1, 73, 171, -1, - 171, -1, -1, 171, 180, -1, 171, 182, -1, 10, - 83, 11, 203, -1, -1, 10, 84, 173, 11, 176, - -1, 84, 3, 176, 4, -1, 22, 3, 174, 4, - -1, 10, 22, 11, 212, -1, 22, 6, 212, -1, - 10, 85, 11, 221, -1, 10, 91, 11, 223, -1, - 10, 51, 11, 190, -1, 86, 3, 177, 4, -1, - 175, -1, 175, 5, 174, -1, 212, -1, 25, 6, - 234, -1, 179, -1, 179, 5, 176, -1, 178, -1, - 178, 5, 177, -1, 178, 177, -1, 40, 6, 234, - -1, 87, 6, 77, -1, 88, 6, 234, -1, 204, - -1, 205, -1, 207, -1, 208, -1, 209, -1, 211, - -1, 210, -1, 89, -1, 90, 6, 234, -1, 206, - -1, 92, 6, 234, -1, 61, -1, 62, -1, 63, - -1, -1, 10, 181, 186, 11, 226, -1, 226, -1, - -1, 3, 183, 184, 4, -1, 187, -1, 185, -1, - 185, 5, 184, -1, 187, 5, 184, -1, 185, 184, - -1, 187, 184, -1, 74, 6, 226, -1, 68, 6, - 234, -1, 20, 6, 193, -1, 20, 6, 102, -1, - 53, 6, 76, -1, 187, -1, 187, 5, 186, -1, - 193, -1, 196, -1, 216, -1, 217, -1, 188, -1, - 49, 6, 189, -1, 50, 6, 192, -1, 195, -1, - 195, 9, 189, -1, 191, -1, 191, 5, 190, -1, - 234, -1, 234, -1, 12, -1, 43, -1, 44, -1, - 45, -1, 46, -1, 47, -1, 48, -1, 14, -1, - 15, -1, 13, -1, 105, -1, 103, -1, 218, -1, - 220, -1, 202, -1, 27, -1, 27, 6, 133, -1, - 234, -1, 234, 148, 234, 149, -1, 234, 148, 150, - 149, -1, 16, 6, 198, -1, 17, 6, 199, -1, - 18, 6, 200, -1, 19, 6, 201, -1, 24, 6, - 213, -1, 23, 6, 214, -1, 26, 6, 215, -1, - 107, 6, 226, -1, 109, 6, 226, -1, 110, 6, - 226, -1, 111, 6, 226, -1, 112, 6, 226, -1, - 38, 6, 222, -1, 37, 6, 234, -1, 113, 6, - 226, -1, 194, -1, 20, 6, 202, -1, 83, 6, - 203, -1, 40, 6, 234, -1, 135, -1, 57, 6, - 234, -1, 126, -1, 105, -1, 218, -1, 96, -1, - 97, -1, 98, -1, 99, -1, 100, -1, 101, -1, - 80, -1, 116, -1, 80, -1, 117, -1, 80, -1, - 118, -1, 119, -1, 120, -1, 121, -1, 122, -1, - 123, -1, 135, -1, 124, -1, 125, -1, 126, -1, - 127, -1, 128, -1, 129, -1, 131, -1, 130, -1, - 132, -1, 28, 6, 234, -1, 29, 6, 234, -1, - 30, 6, 234, -1, 31, 6, 234, -1, 32, 6, - 234, -1, 33, 6, 234, -1, 34, -1, 35, -1, - 21, 6, 234, -1, 52, 6, 226, -1, 54, 6, - 226, -1, 107, -1, 219, -1, 113, -1, 114, -1, - 115, -1, 94, -1, 93, -1, 95, -1, 108, -1, - 109, -1, 110, -1, 111, -1, 112, -1, 106, -1, - 102, -1, 104, -1, 36, 6, 234, -1, 38, 6, - 222, -1, 37, 6, 234, -1, 39, -1, 221, 9, - 221, -1, 136, -1, 41, 6, 224, -1, 42, 6, - 225, -1, 223, 5, 223, -1, 134, -1, 55, -1, - 56, -1, 78, -1, 79, -1, 82, -1, 81, -1, - 148, 234, 149, -1, 227, -1, 143, 228, -1, 147, - 228, -1, 228, -1, 229, 140, 228, -1, 229, 141, - 228, -1, 229, 142, 228, -1, 229, -1, 230, 143, - 229, -1, 230, 144, 229, -1, 230, -1, 231, 145, - 230, -1, 231, 146, 230, -1, 231, -1, 232, 139, - 231, -1, 232, -1, 233, 138, 232, -1, 233, -1, - 234, 137, 233, -1 + 83, 6, 203, -1, 20, 6, 202, -1, 165, -1, + 164, 165, -1, -1, 67, 3, 166, 167, 4, -1, + -1, 167, 168, -1, 167, 180, -1, 167, 170, -1, + 169, -1, 169, 5, 168, -1, 169, 168, -1, 68, + 6, 234, -1, 69, 6, 76, -1, 70, -1, 71, + -1, 72, 6, 234, -1, 20, 6, 202, -1, 64, + 6, 234, -1, 65, 6, 234, -1, 66, 6, 234, + -1, 73, 171, -1, 171, -1, -1, 171, 180, -1, + 171, 182, -1, 10, 83, 11, 203, -1, -1, 10, + 84, 173, 11, 176, -1, 84, 3, 176, 4, -1, + 22, 3, 174, 4, -1, 10, 22, 11, 212, -1, + 22, 6, 212, -1, 10, 85, 11, 221, -1, 10, + 91, 11, 223, -1, 10, 51, 11, 190, -1, 86, + 3, 177, 4, -1, 175, -1, 175, 5, 174, -1, + 212, -1, 25, 6, 234, -1, 179, -1, 179, 5, + 176, -1, 178, -1, 178, 5, 177, -1, 178, 177, + -1, 40, 6, 234, -1, 87, 6, 77, -1, 88, + 6, 234, -1, 204, -1, 205, -1, 207, -1, 208, + -1, 209, -1, 211, -1, 210, -1, 89, -1, 90, + 6, 234, -1, 206, -1, 92, 6, 234, -1, 61, + -1, 62, -1, 63, -1, -1, 10, 181, 186, 11, + 226, -1, 226, -1, -1, 3, 183, 184, 4, -1, + 187, -1, 185, -1, 185, 5, 184, -1, 187, 5, + 184, -1, 185, 184, -1, 187, 184, -1, 74, 6, + 226, -1, 68, 6, 234, -1, 20, 6, 193, -1, + 20, 6, 102, -1, 53, 6, 76, -1, 187, -1, + 187, 5, 186, -1, 193, -1, 196, -1, 216, -1, + 217, -1, 188, -1, 49, 6, 189, -1, 50, 6, + 192, -1, 195, -1, 195, 9, 189, -1, 191, -1, + 191, 5, 190, -1, 234, -1, 234, -1, 12, -1, + 43, -1, 44, -1, 45, -1, 46, -1, 47, -1, + 48, -1, 14, -1, 15, -1, 13, -1, 105, -1, + 103, -1, 218, -1, 220, -1, 202, -1, 27, -1, + 27, 6, 133, -1, 234, -1, 234, 148, 234, 149, + -1, 234, 148, 150, 149, -1, 16, 6, 198, -1, + 17, 6, 199, -1, 18, 6, 200, -1, 19, 6, + 201, -1, 24, 6, 213, -1, 23, 6, 214, -1, + 26, 6, 215, -1, 107, 6, 226, -1, 109, 6, + 226, -1, 110, 6, 226, -1, 111, 6, 226, -1, + 112, 6, 226, -1, 38, 6, 222, -1, 37, 6, + 234, -1, 113, 6, 226, -1, 194, -1, 20, 6, + 202, -1, 83, 6, 203, -1, 40, 6, 234, -1, + 135, -1, 57, 6, 234, -1, 126, -1, 105, -1, + 218, -1, 96, -1, 97, -1, 98, -1, 99, -1, + 100, -1, 101, -1, 80, -1, 116, -1, 80, -1, + 117, -1, 80, -1, 118, -1, 119, -1, 120, -1, + 121, -1, 122, -1, 123, -1, 135, -1, 124, -1, + 125, -1, 126, -1, 127, -1, 128, -1, 129, -1, + 131, -1, 130, -1, 132, -1, 28, 6, 234, -1, + 29, 6, 234, -1, 30, 6, 234, -1, 31, 6, + 234, -1, 32, 6, 234, -1, 33, 6, 234, -1, + 34, -1, 35, -1, 21, 6, 234, -1, 52, 6, + 226, -1, 54, 6, 226, -1, 107, -1, 219, -1, + 113, -1, 114, -1, 115, -1, 94, -1, 93, -1, + 95, -1, 108, -1, 109, -1, 110, -1, 111, -1, + 112, -1, 106, -1, 102, -1, 104, -1, 36, 6, + 234, -1, 38, 6, 222, -1, 37, 6, 234, -1, + 39, -1, 221, 9, 221, -1, 136, -1, 41, 6, + 224, -1, 42, 6, 225, -1, 223, 5, 223, -1, + 134, -1, 55, -1, 56, -1, 78, -1, 79, -1, + 82, -1, 81, -1, 148, 234, 149, -1, 227, -1, + 143, 228, -1, 147, 228, -1, 228, -1, 229, 140, + 228, -1, 229, 141, 228, -1, 229, 142, 228, -1, + 229, -1, 230, 143, 229, -1, 230, 144, 229, -1, + 230, -1, 231, 145, 230, -1, 231, 146, 230, -1, + 231, -1, 232, 139, 231, -1, 232, -1, 233, 138, + 232, -1, 233, -1, 234, 137, 233, -1 }; /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in @@ -2220,30 +2232,30 @@ 24, 27, 30, 33, 36, 39, 40, 46, 48, 52, 55, 56, 60, 64, 68, 72, 76, 80, 84, 88, 92, 96, 100, 104, 106, 110, 112, 114, 118, 120, - 125, 130, 134, 138, 142, 146, 150, 154, 156, 159, - 160, 166, 167, 170, 173, 176, 178, 182, 185, 189, - 193, 195, 197, 201, 205, 209, 213, 217, 220, 222, - 223, 226, 229, 234, 235, 241, 246, 251, 256, 260, - 265, 270, 275, 280, 282, 286, 288, 292, 294, 298, - 300, 304, 307, 311, 315, 319, 321, 323, 325, 327, - 329, 331, 333, 335, 339, 341, 345, 347, 349, 351, - 352, 358, 360, 361, 366, 368, 370, 374, 378, 381, - 384, 388, 392, 396, 400, 404, 406, 410, 412, 414, - 416, 418, 420, 424, 428, 430, 434, 436, 440, 442, - 444, 446, 448, 450, 452, 454, 456, 458, 460, 462, - 464, 466, 468, 470, 472, 474, 476, 480, 482, 487, - 492, 496, 500, 504, 508, 512, 516, 520, 524, 528, - 532, 536, 540, 544, 548, 552, 554, 558, 562, 566, - 568, 572, 574, 576, 578, 580, 582, 584, 586, 588, - 590, 592, 594, 596, 598, 600, 602, 604, 606, 608, - 610, 612, 614, 616, 618, 620, 622, 624, 626, 628, - 630, 632, 636, 640, 644, 648, 652, 656, 658, 660, - 664, 668, 672, 674, 676, 678, 680, 682, 684, 686, - 688, 690, 692, 694, 696, 698, 700, 702, 704, 708, - 712, 716, 718, 722, 724, 728, 732, 736, 738, 740, - 742, 744, 746, 748, 750, 754, 756, 759, 762, 764, - 768, 772, 776, 778, 782, 786, 788, 792, 796, 798, - 802, 804, 808, 810 + 125, 130, 134, 138, 142, 146, 150, 154, 158, 160, + 163, 164, 170, 171, 174, 177, 180, 182, 186, 189, + 193, 197, 199, 201, 205, 209, 213, 217, 221, 224, + 226, 227, 230, 233, 238, 239, 245, 250, 255, 260, + 264, 269, 274, 279, 284, 286, 290, 292, 296, 298, + 302, 304, 308, 311, 315, 319, 323, 325, 327, 329, + 331, 333, 335, 337, 339, 343, 345, 349, 351, 353, + 355, 356, 362, 364, 365, 370, 372, 374, 378, 382, + 385, 388, 392, 396, 400, 404, 408, 410, 414, 416, + 418, 420, 422, 424, 428, 432, 434, 438, 440, 444, + 446, 448, 450, 452, 454, 456, 458, 460, 462, 464, + 466, 468, 470, 472, 474, 476, 478, 480, 484, 486, + 491, 496, 500, 504, 508, 512, 516, 520, 524, 528, + 532, 536, 540, 544, 548, 552, 556, 558, 562, 566, + 570, 572, 576, 578, 580, 582, 584, 586, 588, 590, + 592, 594, 596, 598, 600, 602, 604, 606, 608, 610, + 612, 614, 616, 618, 620, 622, 624, 626, 628, 630, + 632, 634, 636, 640, 644, 648, 652, 656, 660, 662, + 664, 668, 672, 676, 678, 680, 682, 684, 686, 688, + 690, 692, 694, 696, 698, 700, 702, 704, 706, 708, + 712, 716, 720, 722, 726, 728, 732, 736, 740, 742, + 744, 746, 748, 750, 752, 754, 758, 760, 763, 766, + 768, 772, 776, 780, 782, 786, 790, 792, 796, 800, + 802, 806, 808, 812, 814 }; /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ @@ -2254,30 +2266,30 @@ 211, 212, 213, 214, 215, 218, 218, 223, 224, 225, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 247, 248, 251, 253, - 255, 259, 260, 261, 262, 263, 264, 267, 268, 271, - 271, 275, 276, 277, 278, 281, 282, 283, 286, 287, - 288, 289, 290, 291, 292, 293, 294, 298, 299, 302, - 303, 304, 307, 310, 310, 313, 314, 315, 320, 321, - 322, 323, 324, 327, 328, 331, 332, 335, 336, 339, - 340, 341, 344, 345, 346, 349, 352, 354, 356, 358, - 360, 362, 364, 366, 368, 374, 378, 379, 380, 383, - 383, 390, 396, 396, 402, 403, 404, 405, 406, 407, - 410, 413, 414, 415, 416, 421, 422, 425, 426, 427, - 428, 429, 432, 433, 436, 437, 440, 441, 444, 449, - 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, - 463, 464, 465, 466, 467, 470, 471, 474, 475, 476, - 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, + 255, 259, 260, 261, 262, 263, 264, 265, 268, 269, + 272, 272, 276, 277, 278, 279, 282, 283, 284, 287, + 288, 289, 290, 291, 292, 293, 294, 295, 299, 300, + 303, 304, 305, 308, 311, 311, 314, 315, 316, 321, + 322, 323, 324, 325, 328, 329, 332, 333, 336, 337, + 340, 341, 342, 345, 346, 347, 350, 353, 355, 357, + 359, 361, 363, 365, 367, 369, 375, 379, 380, 381, + 384, 384, 391, 397, 397, 403, 404, 405, 406, 407, + 408, 411, 414, 415, 416, 417, 422, 423, 426, 427, + 428, 429, 430, 433, 434, 437, 438, 441, 442, 445, + 450, 452, 453, 454, 455, 456, 457, 458, 459, 460, + 461, 464, 465, 466, 467, 468, 471, 472, 475, 476, + 477, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, - 498, 499, 502, 503, 504, 505, 506, 507, 508, 509, - 512, 513, 516, 517, 520, 521, 524, 527, 530, 533, - 536, 539, 542, 545, 548, 551, 554, 557, 560, 563, - 566, 569, 570, 571, 572, 573, 574, 575, 576, 577, - 580, 581, 584, 585, 586, 587, 588, 589, 590, 591, - 592, 595, 596, 597, 598, 601, 602, 603, 606, 609, - 612, 615, 618, 621, 624, 627, 628, 631, 634, 637, - 643, 644, 647, 648, 649, 655, 656, 657, 661, 662, - 663, 664, 667, 668, 669, 672, 673, 674, 677, 678, - 681, 682, 686, 687 + 498, 499, 500, 503, 504, 505, 506, 507, 508, 509, + 510, 513, 514, 517, 518, 521, 522, 525, 528, 531, + 534, 537, 540, 543, 546, 549, 552, 555, 558, 561, + 564, 567, 570, 571, 572, 573, 574, 575, 576, 577, + 578, 581, 582, 585, 586, 587, 588, 589, 590, 591, + 592, 593, 596, 597, 598, 599, 602, 603, 604, 607, + 610, 613, 616, 619, 622, 625, 628, 629, 632, 635, + 638, 644, 645, 648, 649, 650, 656, 657, 658, 662, + 663, 664, 665, 668, 669, 670, 673, 674, 675, 678, + 679, 682, 683, 687, 688 }; // Print the state stack on the debug stream. @@ -2366,7 +2378,7 @@ } const int BisonParser::yyeof_ = 0; - const int BisonParser::yylast_ = 874; + const int BisonParser::yylast_ = 907; const int BisonParser::yynnts_ = 84; const int BisonParser::yyempty_ = -2; const int BisonParser::yyfinal_ = 3; @@ -2381,9 +2393,9 @@ #line 23 "../s/bif.y" } // BIF /* Line 1141 of lalr1.cc */ -#line 2385 "../bisonflex/bif.tab.cpp" +#line 2397 "../bisonflex/bif.tab.cpp" /* Line 1142 of lalr1.cc */ -#line 692 "../s/bif.y" +#line 693 "../s/bif.y" void BIF::BisonParser::error(const BIF::BisonParser::location_type &loc, const std::string &msg) { Parsing::Error(loc,msg); diff -Nru xilinx-bootgen-2021.2/bif.y xilinx-bootgen-2022.1/bif.y --- xilinx-bootgen-2021.2/bif.y 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/bif.y 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2020 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -262,6 +262,7 @@ | EXT_ID_CODE EQUAL expression { currentBifOptions->SetExtendedIdCode($3); } | other_file_attr EQUAL filename { currentBifOptions->AddFiles($1, $3); } | KEYSRC_ENCRYPTION EQUAL key_src { currentBifOptions->SetEncryptionKeySource($3); } + | PARTITION_TYPE EQUAL ptypevalue { currentBifOptions->SetPdiType($3); } ; image_spec : image_list diff -Nru xilinx-bootgen-2021.2/bif.yy.cpp xilinx-bootgen-2022.1/bif.yy.cpp --- xilinx-bootgen-2021.2/bif.yy.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/bif.yy.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -406,8 +406,8 @@ (yy_c_buf_p) = yy_cp; /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */ -#define YY_NUM_RULES 244 -#define YY_END_OF_BUFFER 245 +#define YY_NUM_RULES 247 +#define YY_END_OF_BUFFER 248 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -415,130 +415,130 @@ flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[1103] = +static yyconst flex_int16_t yy_accept[1111] = { 0, - 0, 0, 245, 243, 240, 241, 242, 243, 232, 234, - 223, 224, 225, 226, 218, 227, 238, 231, 212, 212, - 215, 216, 243, 217, 243, 214, 237, 219, 220, 236, - 237, 214, 214, 214, 214, 214, 214, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 221, 235, 222, 233, 240, 241, 0, 0, - 238, 1, 238, 212, 214, 238, 228, 229, 214, 0, - 237, 214, 214, 237, 214, 214, 214, 237, 237, 237, - 214, 237, 237, 237, 237, 237, 214, 214, 237, 237, - 214, 237, 214, 214, 214, 237, 237, 237, 237, 214, - - 237, 237, 237, 237, 237, 237, 48, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 182, 237, - 237, 237, 181, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 239, 0, 0, - 2, 238, 213, 0, 214, 237, 214, 237, 237, 214, - 68, 179, 237, 237, 237, 237, 237, 237, 208, 237, - 237, 237, 86, 88, 237, 237, 237, 237, 237, 237, - 237, 237, 214, 237, 238, 237, 237, 237, 237, 237, - - 237, 206, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 207, 75, 237, 148, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 32, 82, 177, 237, 237, 237, 237, 178, 237, 237, - 238, 237, 87, 237, 237, 70, 237, 237, 155, 238, - 145, 146, 237, 237, 237, 237, 193, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 56, 149, 237, 184, - 0, 238, 237, 238, 237, 238, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 7, 237, 238, 237, 30, 163, 237, 237, 237, 237, - - 237, 237, 237, 186, 187, 188, 189, 237, 237, 237, - 237, 237, 50, 80, 237, 237, 237, 237, 237, 33, - 237, 237, 237, 29, 237, 238, 160, 203, 237, 49, - 144, 237, 238, 67, 237, 237, 237, 237, 153, 237, - 237, 237, 151, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 174, 175, 238, 237, 237, 237, - 237, 237, 152, 238, 238, 238, 237, 237, 76, 77, - 237, 237, 238, 154, 238, 237, 237, 237, 237, 237, - 237, 237, 237, 85, 237, 237, 8, 237, 164, 167, - 170, 172, 237, 166, 169, 171, 173, 237, 165, 168, - - 237, 237, 237, 237, 237, 237, 237, 237, 237, 95, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 238, 237, 237, 237, 237, 237, 237, 71, - 94, 237, 237, 237, 237, 237, 237, 237, 237, 17, - 237, 23, 237, 237, 237, 237, 238, 238, 237, 237, - 238, 237, 237, 237, 237, 79, 237, 237, 237, 183, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 238, 237, 237, 237, 237, 237, 147, 238, 238, 237, - 237, 237, 237, 238, 238, 237, 238, 237, 237, 237, - 237, 202, 237, 237, 237, 237, 81, 237, 237, 238, - - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 18, 237, 237, 237, - 237, 237, 237, 238, 237, 237, 237, 237, 237, 237, - 238, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 93, 237, 237, 238, 238, 237, 237, - 238, 237, 205, 26, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 143, 142, 238, - 237, 237, 237, 237, 237, 238, 238, 238, 237, 191, - 237, 237, 238, 238, 237, 238, 199, 237, 237, 237, - - 237, 237, 9, 237, 34, 237, 238, 237, 237, 237, - 123, 125, 124, 126, 138, 237, 141, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 89, 237, 237, 237, 237, 237, 237, - 237, 238, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 46, 237, 237, 237, - 118, 237, 159, 238, 237, 237, 83, 237, 132, 237, - 237, 54, 237, 237, 36, 4, 237, 37, 237, 237, - 237, 238, 127, 237, 28, 237, 139, 238, 156, 157, - - 25, 134, 237, 238, 238, 237, 238, 237, 38, 237, - 39, 31, 237, 237, 238, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 74, 237, 237, 237, 237, - 237, 237, 238, 238, 237, 237, 237, 237, 237, 237, - 150, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 161, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 52, 130, 238, 237, 237, 237, 238, - 237, 90, 238, 237, 238, 237, 237, 237, 5, 238, - - 237, 64, 6, 237, 237, 13, 131, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 60, - 55, 237, 237, 237, 237, 237, 44, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 238, 238, 237, 237, - 237, 237, 237, 237, 237, 237, 65, 237, 237, 237, - 237, 237, 237, 237, 237, 11, 237, 192, 45, 237, - 22, 237, 237, 12, 133, 238, 122, 237, 201, 158, - 204, 238, 237, 197, 237, 237, 190, 238, 104, 105, - 106, 107, 108, 109, 110, 111, 237, 35, 237, 237, - 19, 237, 237, 237, 237, 237, 237, 237, 103, 102, - - 51, 237, 20, 237, 237, 3, 237, 237, 237, 16, - 237, 210, 237, 237, 72, 73, 237, 237, 237, 237, - 237, 66, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 24, 237, 57, 237, 237, 195, 238, 237, 91, - 136, 196, 237, 198, 237, 194, 237, 237, 237, 237, - 237, 237, 237, 237, 41, 120, 140, 43, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 119, 58, 200, 237, 237, 237, 237, 10, 237, 237, - 53, 176, 237, 237, 21, 237, 237, 237, 237, 237, - 59, 237, 237, 237, 237, 237, 135, 237, 237, 237, - - 61, 237, 237, 237, 237, 237, 237, 237, 121, 211, - 237, 237, 237, 237, 40, 237, 237, 237, 100, 101, - 99, 237, 237, 15, 237, 237, 14, 97, 98, 96, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 69, 237, 128, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 84, 27, 237, 209, - 237, 162, 237, 237, 237, 237, 237, 112, 115, 185, - 237, 42, 237, 78, 129, 237, 237, 237, 237, 237, - 237, 47, 237, 237, 237, 237, 237, 237, 237, 92, - 237, 180, 237, 237, 62, 63, 137, 113, 116, 114, + 0, 0, 248, 246, 243, 244, 245, 246, 235, 237, + 226, 227, 228, 229, 221, 230, 241, 234, 215, 215, + 218, 219, 246, 220, 246, 217, 240, 222, 223, 239, + 240, 217, 217, 217, 217, 217, 217, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 224, 238, 225, 236, 243, 244, 0, 0, + 241, 1, 241, 215, 217, 241, 231, 232, 217, 0, + 240, 217, 217, 240, 217, 217, 217, 240, 240, 240, + 217, 240, 240, 240, 240, 240, 217, 217, 240, 240, + 217, 240, 217, 217, 217, 240, 240, 240, 240, 217, + + 240, 240, 240, 240, 240, 240, 48, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 185, 240, + 240, 240, 184, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 242, 0, 0, + 2, 241, 216, 0, 217, 240, 217, 240, 240, 217, + 68, 182, 240, 240, 240, 240, 240, 240, 211, 240, + 240, 240, 88, 90, 240, 240, 240, 240, 240, 240, + 240, 240, 217, 240, 241, 240, 240, 240, 240, 240, + + 240, 209, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 210, 75, 240, 151, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 32, 84, 82, 180, 240, 240, 240, 240, 181, 240, + 240, 241, 240, 89, 240, 240, 70, 240, 240, 158, + 241, 148, 149, 240, 240, 240, 240, 196, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 56, 152, 240, + 187, 0, 241, 240, 241, 240, 241, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 7, 240, 241, 240, 30, 166, 240, 240, 240, + + 240, 240, 240, 240, 189, 190, 191, 192, 240, 240, + 240, 240, 240, 50, 80, 240, 240, 240, 240, 240, + 33, 240, 240, 240, 29, 240, 241, 163, 206, 240, + 49, 147, 240, 241, 67, 240, 240, 240, 240, 156, + 240, 240, 240, 154, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 177, 178, 241, 240, 240, + 240, 240, 240, 155, 241, 241, 241, 240, 240, 76, + 77, 240, 240, 241, 157, 241, 240, 240, 240, 240, + 240, 240, 240, 240, 87, 240, 240, 8, 240, 167, + 170, 173, 175, 240, 169, 172, 174, 176, 240, 168, + + 171, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 98, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 241, 240, 240, 240, 240, 240, 240, + 71, 97, 240, 240, 240, 240, 240, 240, 240, 240, + 17, 240, 23, 240, 240, 240, 240, 241, 241, 240, + 240, 241, 240, 240, 240, 240, 79, 240, 240, 240, + 186, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 241, 240, 240, 240, 240, 240, 150, 241, 241, + 240, 240, 240, 240, 241, 241, 241, 240, 241, 240, + 240, 240, 240, 205, 240, 240, 240, 240, 81, 240, + + 240, 241, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 18, 240, + 240, 240, 240, 240, 240, 241, 240, 240, 240, 240, + 240, 240, 241, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 96, 240, 240, 241, 241, + 240, 240, 241, 241, 240, 208, 26, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 146, 145, 241, 240, 240, 240, 240, 240, 241, 241, + 241, 240, 194, 240, 240, 241, 241, 241, 240, 241, + + 202, 240, 240, 240, 240, 240, 9, 240, 34, 240, + 241, 240, 240, 240, 126, 128, 127, 129, 141, 240, + 144, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 91, 240, 240, + 240, 240, 240, 240, 240, 241, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 46, 240, 240, 240, 121, 240, 162, 241, 240, 240, + 85, 83, 240, 135, 240, 240, 54, 240, 240, 36, + 4, 240, 37, 240, 240, 240, 241, 130, 240, 28, + + 240, 142, 241, 159, 160, 25, 137, 240, 241, 241, + 241, 240, 241, 240, 38, 240, 39, 31, 240, 240, + 241, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 74, 240, 240, 240, 240, 240, 240, 241, 241, + 240, 240, 240, 240, 240, 240, 153, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 164, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 52, + 133, 241, 240, 240, 240, 241, 240, 92, 241, 241, + + 240, 241, 240, 240, 240, 5, 241, 240, 64, 6, + 240, 240, 13, 134, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 60, 55, 240, 240, + 240, 240, 240, 44, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 241, 241, 240, 240, 240, 240, 240, + 240, 240, 240, 65, 240, 240, 240, 240, 240, 240, + 240, 240, 11, 240, 195, 45, 240, 22, 240, 240, + 12, 136, 241, 125, 240, 204, 161, 207, 241, 94, + 240, 200, 240, 240, 193, 241, 107, 108, 109, 110, + 111, 112, 113, 114, 240, 35, 240, 240, 19, 240, + + 240, 240, 240, 240, 240, 240, 106, 105, 51, 240, + 20, 240, 240, 3, 240, 240, 240, 16, 240, 213, + 240, 240, 72, 73, 240, 240, 240, 240, 240, 66, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 24, + 240, 57, 240, 240, 198, 241, 240, 93, 139, 199, + 240, 201, 240, 197, 240, 240, 240, 240, 240, 240, + 240, 240, 41, 123, 143, 43, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 122, 58, + 203, 240, 240, 240, 240, 10, 240, 240, 53, 179, + 240, 240, 21, 240, 240, 240, 240, 240, 59, 240, + + 240, 240, 240, 240, 138, 240, 240, 240, 61, 240, + 240, 240, 240, 240, 240, 240, 124, 214, 240, 240, + 240, 240, 40, 240, 240, 240, 103, 104, 102, 240, + 240, 15, 240, 240, 14, 100, 101, 99, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 69, + 240, 131, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 86, 27, 240, 212, 240, 165, + 240, 240, 240, 240, 240, 115, 118, 188, 240, 42, + 240, 78, 132, 240, 240, 240, 240, 240, 240, 47, + 240, 240, 240, 240, 240, 240, 240, 95, 240, 183, - 117, 0 + 240, 240, 62, 63, 140, 116, 119, 117, 120, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -584,141 +584,142 @@ 3, 3, 3, 3, 3, 3, 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[1107] = +static yyconst flex_int16_t yy_base[1115] = { 0, - 0, 0, 2288, 2289, 69, 2284, 2289, 70, 2289, 2289, - 2289, 2289, 2289, 0, 2289, 0, 0, 60, 119, 38, - 2289, 2289, 2256, 2289, 2253, 171, 220, 2289, 2289, 2289, - 2256, 227, 232, 103, 103, 248, 237, 108, 122, 2223, - 37, 2227, 124, 115, 214, 258, 2222, 280, 300, 41, - 271, 2231, 2289, 2289, 2289, 2289, 169, 2276, 2271, 173, - 0, 2289, 360, 138, 413, 460, 2289, 2289, 2249, 232, - 2248, 254, 489, 257, 152, 64, 189, 264, 154, 223, + 0, 0, 2297, 2298, 69, 2293, 2298, 70, 2298, 2298, + 2298, 2298, 2298, 0, 2298, 0, 0, 60, 119, 38, + 2298, 2298, 2265, 2298, 2262, 171, 220, 2298, 2298, 2298, + 2265, 227, 232, 103, 103, 248, 237, 108, 122, 2232, + 37, 2236, 124, 115, 214, 258, 2231, 280, 300, 41, + 271, 2240, 2298, 2298, 2298, 2298, 169, 2285, 2280, 173, + 0, 2298, 360, 138, 413, 460, 2298, 2298, 2258, 232, + 2257, 254, 489, 257, 152, 64, 189, 264, 154, 223, 235, 295, 153, 267, 276, 122, 318, 306, 301, 278, 323, 296, 329, 307, 356, 365, 304, 329, 351, 330, 350, 353, 358, 330, 367, 379, 369, 373, 375, 377, 378, 388, 382, 387, 231, 391, 414, 376, 393, 419, - 434, 421, 394, 397, 398, 431, 422, 430, 2247, 433, - 440, 491, 467, 493, 441, 509, 427, 437, 497, 495, - 438, 498, 526, 499, 512, 520, 522, 500, 528, 527, - 501, 529, 531, 530, 536, 532, 537, 2289, 550, 2271, - 2289, 593, 0, 0, 551, 598, 313, 547, 541, 550, - 555, 2245, 562, 544, 586, 592, 587, 588, 2244, 602, - 584, 607, 2243, 622, 612, 435, 613, 618, 589, 619, - 614, 623, 632, 560, 646, 553, 625, 626, 628, 641, - - 644, 2242, 646, 649, 650, 648, 652, 653, 651, 654, - 655, 656, 658, 2241, 2240, 669, 688, 659, 657, 660, - 671, 679, 693, 681, 684, 685, 690, 691, 696, 692, - 2239, 698, 699, 704, 694, 695, 700, 2238, 726, 702, - 739, 703, 2237, 731, 705, 2236, 701, 737, 2235, 2210, - 752, 753, 733, 749, 735, 721, 756, 744, 758, 747, - 751, 754, 757, 760, 764, 759, 2233, 2232, 762, 761, - 2252, 788, 554, 803, 774, 82, 775, 782, 783, 787, - 785, 801, 797, 798, 790, 799, 803, 806, 807, 809, - 816, 808, 2211, 812, 2229, 2228, 817, 821, 819, 826, - - 827, 830, 836, 0, 0, 0, 0, 833, 838, 841, - 845, 848, 2227, 844, 846, 849, 847, 852, 857, 2226, - 855, 858, 859, 2225, 860, 2194, 876, 2223, 865, 2222, - 2221, 861, 2192, 2219, 873, 881, 875, 877, 2218, 883, - 884, 885, 2217, 889, 887, 895, 891, 896, 897, 898, - 901, 903, 899, 916, 0, 0, 2189, 904, 907, 905, - 911, 918, 2215, 2183, 2183, 2182, 920, 923, 2211, 2210, - 925, 927, 214, 930, 2192, 929, 931, 933, 932, 938, - 936, 940, 939, 2208, 943, 949, 958, 947, 0, 0, - 0, 0, 973, 0, 0, 0, 0, 983, 0, 0, - - 951, 962, 946, 956, 967, 974, 980, 982, 984, 985, - 986, 987, 988, 989, 991, 994, 990, 998, 999, 995, - 1006, 996, 2176, 1000, 1003, 1007, 1011, 1029, 1030, 1032, - 1034, 1009, 1035, 1036, 1038, 1039, 1040, 1043, 1044, 2206, - 1047, 1045, 1048, 1050, 1049, 1052, 2192, 2174, 428, 1051, - 2178, 1056, 1053, 1058, 1062, 2202, 1059, 1060, 1067, 1070, - 1072, 1073, 1075, 1081, 1083, 1084, 1085, 1086, 1093, 1103, - 2186, 1088, 1100, 1102, 1104, 1105, 2213, 2186, 2185, 1108, - 1110, 1111, 1115, 2170, 2169, 1112, 2177, 1114, 1116, 1113, - 1119, 2194, 1117, 1118, 1124, 1120, 2193, 1122, 1131, 2175, - - 1123, 1140, 1125, 1153, 1149, 1156, 1160, 1134, 1163, 1150, - 1159, 1161, 1162, 1167, 1164, 1165, 1168, 1169, 1171, 1173, - 1174, 1175, 1179, 1195, 1170, 1189, 2191, 1172, 1197, 1196, - 1198, 1202, 1203, 2175, 1204, 1206, 1208, 1210, 1212, 1216, - 2161, 1219, 1218, 1223, 1220, 1227, 1224, 1228, 1231, 1234, - 1239, 1245, 1232, 1251, 1225, 1235, 2153, 2174, 1243, 1254, - 2171, 1257, 2185, 2184, 1259, 1261, 1266, 1264, 1267, 1268, - 1269, 1271, 1272, 1274, 1275, 1276, 1279, 2183, 2182, 2158, - 1281, 1280, 1278, 1282, 1283, 2150, 2144, 2143, 1284, 2177, - 1289, 1298, 2149, 2149, 1301, 2141, 2173, 1303, 1306, 1307, - - 1309, 1308, 2172, 1311, 2171, 1312, 2152, 1313, 1314, 1316, - 2169, 2168, 2167, 2166, 2165, 1317, 2164, 1318, 1320, 1321, - 1324, 1328, 1334, 1331, 1337, 1335, 1340, 1343, 1347, 1350, - 1342, 1348, 1353, 1355, 1357, 1358, 1361, 1363, 1366, 1367, - 1368, 1369, 1372, 0, 1373, 1375, 1377, 1379, 1380, 1381, - 1392, 1390, 1391, 1387, 1395, 1397, 1394, 1399, 1402, 1403, - 1406, 1409, 1410, 1413, 1408, 1416, 2163, 1418, 1419, 1423, - 2162, 1427, 0, 2126, 1424, 1428, 0, 1429, 2160, 1431, - 1435, 2159, 1432, 1433, 2158, 2157, 1438, 2156, 1442, 1446, - 1441, 2124, 2154, 1447, 1453, 1448, 2153, 2139, 0, 0, - - 2151, 2150, 1449, 2117, 2130, 1454, 2116, 1456, 2146, 1466, - 2145, 2144, 1467, 1468, 2110, 1472, 1474, 1475, 1477, 1480, - 1478, 1482, 1483, 1494, 1484, 1485, 1487, 1488, 1489, 1490, - 1498, 1491, 1495, 1501, 1497, 1503, 1506, 1515, 1516, 1517, - 1520, 1521, 1522, 1523, 1524, 2142, 1525, 1532, 1528, 1527, - 1533, 1534, 2143, 2148, 1536, 1542, 1543, 1547, 1544, 1554, - 2139, 1552, 1555, 1556, 1557, 1558, 1562, 1564, 1565, 1568, - 1571, 1569, 0, 1572, 1574, 1573, 1576, 1577, 1580, 1588, - 1584, 1589, 1594, 2138, 2137, 2104, 1596, 1600, 1602, 2100, - 1582, 0, 2113, 1603, 2116, 1607, 1608, 1609, 2132, 2100, - - 1637, 2130, 2129, 1612, 1619, 2128, 2127, 1616, 1638, 1615, - 1610, 1642, 1643, 1644, 1647, 1648, 1625, 1617, 1621, 2126, - 2125, 1645, 1649, 1652, 1653, 1661, 2124, 1663, 1664, 1665, - 1666, 1667, 1668, 1671, 1672, 1669, 2129, 2131, 1675, 1677, - 1688, 1690, 1673, 1670, 1692, 1691, 2121, 1697, 1698, 1681, - 1699, 1705, 1701, 1706, 1707, 2120, 1708, 2119, 2118, 1710, - 1715, 1711, 1709, 2117, 2116, 2098, 2114, 1714, 2113, 0, - 2112, 2092, 1716, 0, 1717, 1720, 2110, 2092, 2108, 2107, - 2106, 2105, 2104, 2103, 2102, 2101, 1724, 2100, 1729, 1722, - 2099, 1732, 1734, 1733, 1735, 1742, 1743, 1744, 2098, 2097, - - 2096, 1745, 2095, 1746, 1750, 2094, 1747, 1748, 1752, 2093, - 1751, 2092, 1759, 1754, 0, 0, 1768, 1769, 1755, 1770, - 1772, 2091, 1771, 1773, 1780, 1774, 1782, 1785, 1786, 1787, - 1788, 2090, 1794, 2089, 1796, 1797, 2088, 2059, 1800, 0, - 2086, 2085, 1801, 0, 1804, 2084, 1803, 1806, 1808, 1805, - 1813, 1809, 1815, 1810, 2083, 2082, 2081, 2080, 1817, 1835, - 1825, 1838, 1836, 1839, 1840, 1811, 1841, 1846, 1842, 1849, - 2079, 2078, 2077, 1812, 1847, 1816, 1850, 2076, 1851, 1852, - 2075, 0, 1862, 1863, 2074, 1864, 1867, 1870, 1868, 1871, - 2073, 1872, 1873, 1874, 1878, 1883, 2072, 1882, 1876, 1879, - - 2071, 1881, 1890, 1885, 1884, 1892, 1895, 1902, 2070, 2069, - 1893, 1903, 1904, 1907, 2058, 1906, 1911, 1912, 2057, 2055, - 2054, 1917, 1919, 2053, 1923, 1924, 2052, 2051, 2050, 2049, - 1925, 1927, 1930, 1928, 1936, 1938, 1939, 1940, 1942, 1943, - 1946, 2048, 1947, 2047, 1950, 1944, 1949, 1960, 1961, 1984, - 1988, 1952, 1969, 1981, 1982, 1956, 2046, 2044, 1987, 2043, - 1989, 2041, 1990, 1991, 1992, 1993, 1994, 2039, 2038, 2035, - 1995, 2027, 1996, 1962, 1958, 1999, 2002, 2001, 2007, 2000, - 2008, 1955, 2010, 2013, 2020, 1997, 2019, 2025, 2026, 1954, - 2022, 1620, 2040, 2042, 1176, 707, 561, 436, 432, 384, + 434, 421, 394, 397, 398, 431, 422, 430, 437, 433, + 440, 491, 467, 493, 441, 509, 435, 495, 497, 499, + 436, 501, 525, 427, 500, 514, 517, 523, 520, 524, + 438, 528, 531, 532, 535, 538, 534, 2298, 550, 2281, + 2298, 590, 0, 0, 549, 595, 313, 540, 542, 553, + 554, 2255, 560, 584, 586, 589, 585, 597, 2254, 581, + 548, 605, 2253, 623, 611, 578, 616, 614, 587, 613, + 620, 617, 557, 621, 646, 624, 625, 628, 640, 622, + + 644, 2252, 646, 647, 648, 649, 650, 653, 651, 655, + 656, 659, 660, 2251, 2250, 667, 688, 668, 658, 669, + 663, 673, 694, 677, 682, 684, 689, 691, 692, 695, + 2249, 2248, 698, 697, 704, 699, 700, 701, 2247, 723, + 705, 730, 718, 2246, 727, 728, 2245, 703, 729, 2244, + 2219, 746, 750, 707, 759, 731, 736, 758, 741, 760, + 753, 748, 756, 761, 762, 757, 764, 2242, 2241, 765, + 768, 2261, 806, 767, 814, 773, 82, 771, 782, 777, + 783, 472, 808, 785, 781, 787, 789, 812, 813, 816, + 815, 823, 790, 2220, 817, 2238, 2237, 818, 824, 826, + + 827, 828, 836, 831, 0, 0, 0, 0, 834, 837, + 842, 843, 839, 2236, 846, 850, 851, 859, 853, 856, + 2235, 854, 860, 861, 2234, 872, 2203, 875, 2232, 864, + 2231, 2230, 876, 2201, 2228, 877, 878, 879, 881, 2227, + 883, 886, 888, 2226, 887, 889, 895, 893, 897, 898, + 899, 902, 775, 901, 929, 0, 0, 2198, 903, 906, + 905, 907, 910, 2224, 2192, 2192, 2191, 911, 916, 2220, + 2219, 919, 928, 919, 931, 2201, 923, 937, 938, 939, + 941, 942, 947, 948, 2217, 949, 953, 965, 957, 0, + 0, 0, 0, 970, 0, 0, 0, 0, 979, 0, + + 0, 956, 985, 955, 960, 964, 973, 984, 961, 990, + 991, 992, 976, 993, 994, 995, 1002, 996, 998, 1007, + 1006, 1009, 1005, 2185, 1010, 1011, 1012, 1018, 1025, 1034, + 1029, 1039, 1015, 1019, 1020, 1040, 1042, 1044, 1047, 1048, + 2215, 1049, 1050, 1053, 1054, 1055, 1057, 2201, 2183, 1061, + 1060, 204, 1058, 1064, 1063, 1066, 2212, 1067, 1070, 1071, + 1077, 1076, 1080, 1081, 1082, 1084, 1086, 1091, 1094, 1096, + 1109, 2196, 1092, 1098, 1107, 1110, 1113, 2223, 2196, 2195, + 1115, 1114, 1116, 1118, 2180, 2179, 2181, 1117, 2186, 1119, + 1120, 1121, 1125, 2203, 1122, 1123, 1128, 1126, 2202, 1129, + + 1134, 2184, 1130, 1138, 1136, 1158, 1154, 1159, 1166, 1139, + 1165, 1161, 1162, 1167, 1168, 1169, 1170, 1172, 1173, 1174, + 1177, 1175, 1176, 1181, 1185, 1186, 1189, 1201, 2200, 1179, + 1203, 1208, 1209, 1210, 1211, 2184, 1183, 1212, 1213, 1215, + 1214, 1218, 2170, 1228, 1224, 1229, 1219, 1233, 1230, 1235, + 1237, 1243, 1248, 1234, 1239, 1245, 1241, 1254, 2162, 2183, + 1244, 1252, 2170, 2179, 1259, 2193, 2192, 1263, 1268, 1266, + 1269, 1270, 1272, 1273, 1275, 1276, 1277, 1279, 1281, 1284, + 2191, 2190, 2166, 1285, 1288, 1286, 1299, 1289, 2158, 2152, + 2151, 1293, 2185, 1295, 1297, 2157, 2157, 2169, 1302, 2148, + + 2180, 1304, 1310, 1312, 1313, 1314, 2179, 1316, 2178, 1315, + 2159, 1317, 1318, 1320, 2176, 2175, 2174, 2173, 2172, 1329, + 2171, 1331, 1322, 1326, 1332, 1333, 1339, 1335, 1340, 1337, + 1344, 1349, 1351, 1345, 1353, 1358, 1363, 1364, 1365, 1360, + 1367, 1369, 1370, 1371, 1373, 1375, 1372, 0, 1377, 1378, + 1379, 1380, 1382, 1383, 1387, 1401, 1397, 1399, 1401, 1403, + 1405, 1410, 1408, 1411, 1414, 1415, 1413, 1416, 1422, 1423, + 2170, 1419, 1424, 1417, 2169, 1425, 0, 2133, 1426, 1427, + 0, 0, 1428, 2167, 1433, 1437, 2166, 1443, 1445, 2165, + 2164, 1448, 2163, 1447, 1450, 1451, 2131, 2161, 1452, 1457, + + 1456, 2160, 2146, 0, 0, 2158, 2157, 1455, 2124, 2137, + 2120, 1470, 2122, 1461, 2152, 1460, 2151, 2150, 1472, 1474, + 2116, 1475, 1479, 1480, 1481, 1483, 1484, 1485, 1488, 1499, + 1490, 1489, 1493, 1492, 1494, 1495, 1503, 1500, 1508, 1509, + 1496, 1502, 1511, 1514, 1520, 1521, 1523, 1524, 1528, 1527, + 1532, 2148, 1529, 1537, 1538, 1534, 1540, 1542, 2149, 2154, + 1543, 1546, 1549, 1551, 1552, 1557, 2145, 1556, 1558, 1561, + 1562, 1563, 1564, 1571, 1565, 1576, 1573, 1577, 0, 1574, + 1579, 1578, 1585, 1581, 1586, 1587, 1588, 1589, 1596, 2144, + 2143, 2110, 1604, 1607, 1608, 2106, 1609, 0, 2119, 2122, + + 1610, 2121, 1611, 1614, 1615, 2137, 2105, 1643, 2135, 2134, + 1617, 1628, 2133, 2132, 1622, 1618, 1619, 1616, 1648, 1649, + 1652, 1653, 1654, 1625, 1620, 1623, 2131, 2130, 1655, 1656, + 1658, 1659, 1662, 2129, 1667, 1668, 1670, 1671, 1673, 1669, + 1675, 1676, 1678, 2134, 2136, 1679, 1681, 1683, 1692, 1682, + 1674, 1699, 1701, 2126, 1702, 1703, 1705, 1706, 1707, 1708, + 1713, 1709, 2125, 1710, 2124, 2123, 1714, 1715, 1717, 1716, + 2122, 2121, 2103, 2119, 1721, 2118, 0, 2117, 2097, 0, + 1726, 0, 1718, 1719, 2115, 2097, 2113, 2112, 2111, 2110, + 2109, 2108, 2107, 2106, 1729, 2105, 1720, 1741, 2104, 1731, + + 1733, 1734, 1742, 1743, 1744, 1749, 2103, 2102, 2101, 1753, + 2100, 1747, 1754, 2099, 1755, 1756, 1761, 2098, 1759, 2097, + 1768, 1769, 0, 0, 1772, 1774, 1773, 1775, 1777, 2096, + 1776, 1787, 1780, 1790, 1781, 1778, 1784, 1779, 1793, 2095, + 1782, 2094, 1802, 1804, 2093, 2064, 1807, 0, 2091, 2090, + 1808, 0, 1810, 2089, 1809, 1811, 1813, 1816, 1819, 1815, + 1820, 1817, 2088, 2087, 2086, 2085, 1824, 1825, 1818, 1828, + 1841, 1844, 1846, 1822, 1847, 1848, 1851, 1842, 2084, 2083, + 2082, 1850, 1853, 1852, 1855, 2081, 1858, 1857, 2080, 0, + 1860, 1866, 2079, 1865, 1869, 1870, 1874, 1875, 2078, 1876, + + 1877, 1880, 1881, 1887, 2077, 1886, 1879, 1885, 2076, 1889, + 1890, 1891, 1898, 1895, 1905, 1900, 2075, 2074, 1906, 1909, + 1908, 1910, 2061, 1917, 1918, 1907, 2060, 2059, 2058, 1923, + 1927, 2057, 1919, 1924, 2056, 2054, 2053, 2052, 1930, 1932, + 1937, 1938, 1943, 1942, 1945, 1946, 1948, 1949, 1951, 2051, + 1952, 2050, 1958, 1950, 1954, 1956, 1964, 1989, 1991, 1961, + 1962, 1967, 1966, 1990, 2049, 2048, 1992, 2046, 1993, 2044, + 1994, 1995, 1996, 1998, 1999, 2043, 2042, 2041, 1997, 2040, + 2000, 2039, 2033, 2004, 2001, 2005, 2006, 2003, 2007, 1959, + 2008, 2002, 2012, 2025, 2026, 2030, 2031, 1957, 2032, 1627, - 230, 2289, 152, 2087, 2090, 2093 + 2045, 2047, 1178, 693, 553, 432, 428, 384, 230, 2298, + 152, 2092, 2095, 2098 } ; -static yyconst flex_int16_t yy_def[1107] = +static yyconst flex_int16_t yy_def[1115] = { 0, - 1102, 1, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1103, 1102, 1103, 1103, 1103, 1103, 19, - 1102, 1102, 1102, 1102, 1102, 1102, 26, 1102, 1102, 1102, + 1110, 1, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 1111, 1110, 1111, 1111, 1111, 1111, 19, + 1110, 1110, 1110, 1110, 1110, 1110, 26, 1110, 1110, 1110, 27, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 1102, 1102, 1102, 1102, 1102, 1102, 1104, 1104, - 1103, 1102, 1105, 19, 19, 65, 1102, 1102, 26, 1102, + 27, 27, 1110, 1110, 1110, 1110, 1110, 1110, 1112, 1112, + 1111, 1110, 1113, 19, 19, 65, 1110, 1110, 26, 1110, 27, 26, 27, 27, 73, 73, 73, 27, 27, 27, 73, 27, 27, 27, 27, 27, 73, 73, 27, 27, 73, 27, 73, 73, 73, 27, 27, 27, 27, 73, @@ -728,98 +729,98 @@ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 27, 1102, 1102, 1106, - 1102, 1105, 66, 1103, 73, 27, 73, 27, 27, 73, + 27, 27, 27, 27, 27, 27, 27, 1110, 1110, 1114, + 1110, 1113, 66, 1111, 73, 27, 73, 27, 27, 73, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 73, 27, 1103, 27, 27, 27, 27, 27, + 27, 27, 73, 27, 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 1103, 27, 27, 27, 27, 27, 27, 27, 27, 1103, + 27, 1111, 27, 27, 27, 27, 27, 27, 27, 27, + 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 1112, 1111, 27, 1111, 27, 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 1104, 1103, 27, 1103, 27, 1103, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 1103, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 1111, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 1103, 1103, 1103, 1103, 27, 27, 27, + 27, 27, 27, 27, 1111, 1111, 1111, 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 1103, 27, 27, 27, 27, - 27, 27, 1103, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 1111, 27, 27, 27, + 27, 27, 27, 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 1103, 1103, 1103, 27, 27, 27, - 27, 27, 27, 1103, 1103, 1103, 27, 27, 27, 27, - 27, 27, 1103, 27, 1103, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 27, 27, 1103, 1103, - 1103, 1103, 27, 1103, 1103, 1103, 1103, 27, 1103, 1103, + 27, 27, 27, 27, 27, 1111, 1111, 1111, 27, 27, + 27, 27, 27, 27, 1111, 1111, 1111, 27, 27, 27, + 27, 27, 27, 1111, 27, 1111, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 27, 27, 27, 1111, + 1111, 1111, 1111, 27, 1111, 1111, 1111, 1111, 27, 1111, + 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 1103, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 27, 1111, 1111, 27, + 27, 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 1103, 1103, 27, 27, - 1103, 27, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 1111, 27, 27, 27, 27, 27, 1111, 1111, 1111, + 27, 27, 27, 27, 1111, 1111, 1111, 27, 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 1103, 27, 27, 27, 27, 27, 1103, 1103, 1103, 27, - 27, 27, 27, 1103, 1103, 27, 1103, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 27, 27, 27, 1103, + 27, 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 1111, 27, 27, 27, 27, + 27, 27, 1111, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 27, 27, 1111, 1111, + 27, 27, 1111, 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 1103, 27, 27, 27, 27, 27, 27, - 1103, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 1103, 1103, 27, 27, - 1103, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 27, 27, 27, 1103, - 27, 27, 27, 27, 27, 1103, 1103, 1103, 27, 27, - 27, 27, 1103, 1103, 27, 1103, 27, 27, 27, 27, + 27, 27, 1111, 27, 27, 27, 27, 27, 1111, 1111, + 1111, 27, 27, 27, 27, 1111, 1111, 1111, 27, 1111, - 27, 27, 27, 27, 27, 27, 1103, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, + 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 1103, 27, 27, 27, 27, 27, 27, - 27, 1103, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 1103, 1103, 27, 27, 1103, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 27, 1111, 27, 27, + 27, 27, 27, 27, 27, 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 1103, 27, 27, 27, 27, 27, 1103, 1103, 1103, + 27, 27, 27, 27, 27, 27, 1111, 1111, 27, 27, + 1111, 1111, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 1111, 27, 27, 27, - 27, 27, 27, 1103, 1103, 27, 1103, 27, 27, 27, - 27, 27, 27, 27, 1103, 27, 27, 27, 27, 27, + 27, 27, 1111, 1111, 1111, 27, 27, 27, 1111, 1111, + 1111, 27, 1111, 27, 27, 27, 27, 27, 27, 27, + 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 27, 27, 1111, 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 1103, 1103, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 27, 27, 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 1103, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 1103, 27, 27, 27, 1103, - 27, 1103, 1103, 27, 1103, 27, 27, 27, 27, 1103, + 27, 1111, 27, 27, 27, 1111, 27, 1111, 1111, 1111, + 27, 1111, 27, 27, 27, 27, 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 1103, 1103, 27, 27, + 27, 27, 27, 1111, 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 1103, 27, 27, 27, 1103, - 27, 1103, 27, 1103, 27, 27, 27, 1103, 27, 27, - 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 1111, 27, 27, 27, 1111, 27, 1111, 1111, + 27, 1111, 27, 27, 27, 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 1103, 1103, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 27, 1103, 27, 1103, - 27, 27, 27, 1103, 27, 27, 27, 27, 27, 27, + 27, 27, 1111, 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 1111, 27, 1111, 27, 27, + 27, 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 1103, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 27, 27, 27, 1111, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, @@ -833,10 +834,11 @@ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 0, 1102, 1102, 1102, 1102 + 27, 27, 27, 27, 27, 27, 27, 27, 27, 0, + 1110, 1110, 1110, 1110 } ; -static yyconst flex_int16_t yy_nxt[2360] = +static yyconst flex_int16_t yy_nxt[2369] = { 0, 4, 5, 6, 7, 5, 4, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 20, @@ -847,17 +849,17 @@ 51, 27, 27, 52, 27, 27, 53, 54, 55, 56, 57, 62, 61, 57, 59, 59, 63, 59, 59, 59, 59, 111, 59, 69, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 112, 151, 399, + 59, 59, 59, 59, 59, 59, 59, 112, 151, 400, - 400, 61, 60, 60, 60, 152, 59, 170, 59, 59, + 401, 61, 60, 60, 60, 152, 59, 170, 59, 59, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 64, 64, 64, 64, - 64, 64, 64, 64, 64, 64, 87, 91, 88, 1102, + 64, 64, 64, 64, 64, 64, 87, 91, 88, 1110, 89, 65, 105, 66, 61, 120, 106, 90, 92, 65, 65, 65, 65, 65, 65, 107, 114, 115, 116, 121, 57, 69, 61, 57, 108, 109, 117, 182, 118, 158, - 1102, 1102, 66, 61, 119, 61, 61, 61, 69, 69, + 1110, 1110, 66, 61, 119, 61, 61, 61, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 70, 178, 159, 61, 173, 69, 71, 71, 179, 61, 69, 169, @@ -865,241 +867,242 @@ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 171, 164, 72, - 1102, 73, 71, 215, 69, 484, 485, 1102, 1102, 122, + 1110, 73, 71, 215, 69, 563, 564, 1110, 1110, 122, 71, 71, 71, 71, 71, 71, 74, 75, 164, 123, 76, 77, 124, 81, 165, 78, 125, 100, 79, 82, - 83, 1102, 174, 84, 1102, 101, 85, 80, 93, 102, - 94, 1102, 175, 95, 1102, 103, 86, 104, 126, 96, + 83, 1110, 174, 84, 1110, 101, 85, 80, 93, 102, + 94, 1110, 175, 95, 1110, 103, 86, 104, 126, 96, - 127, 97, 136, 1102, 168, 1102, 128, 98, 172, 129, + 127, 97, 136, 1110, 168, 1110, 128, 98, 172, 129, 130, 99, 153, 131, 154, 132, 133, 166, 134, 155, - 137, 180, 1102, 1102, 138, 69, 69, 276, 1102, 156, - 181, 1102, 69, 186, 176, 187, 191, 69, 139, 140, + 137, 180, 1110, 1110, 138, 69, 69, 277, 1110, 156, + 181, 1110, 69, 186, 176, 187, 191, 69, 139, 140, 141, 142, 69, 143, 144, 185, 196, 145, 69, 69, - 193, 146, 147, 177, 184, 148, 1102, 1102, 149, 150, + 193, 146, 147, 177, 184, 148, 1110, 1110, 149, 150, 160, 160, 161, 160, 160, 160, 160, 160, 160, 160, - 160, 160, 183, 160, 188, 69, 197, 1102, 1102, 195, - 1102, 189, 200, 204, 190, 1102, 192, 160, 160, 160, - 160, 160, 1102, 198, 1102, 160, 1102, 160, 160, 203, - - 1102, 201, 1102, 1102, 1102, 1102, 1102, 205, 207, 1102, - 199, 1102, 202, 208, 1102, 1102, 194, 210, 1102, 218, - 1102, 1102, 213, 209, 1102, 1102, 160, 160, 160, 160, + 160, 160, 183, 160, 188, 69, 197, 1110, 1110, 195, + 1110, 189, 200, 204, 190, 1110, 192, 160, 160, 160, + 160, 160, 1110, 198, 1110, 160, 1110, 160, 160, 203, + + 1110, 201, 1110, 1110, 1110, 1110, 1110, 205, 207, 1110, + 199, 1110, 202, 208, 1110, 1110, 194, 210, 1110, 218, + 1110, 1110, 213, 209, 1110, 1110, 160, 160, 160, 160, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, - 206, 1102, 211, 212, 219, 214, 1102, 61, 1102, 1102, - 216, 228, 227, 226, 1102, 1102, 217, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 225, 1102, 1102, 559, - 230, 220, 221, 231, 222, 232, 61, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 223, 229, 243, - 234, 224, 163, 233, 1102, 244, 240, 248, 245, 295, + 206, 1110, 211, 212, 219, 214, 1110, 61, 1110, 1110, + 216, 228, 227, 226, 1110, 1110, 217, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 225, 1110, 1110, 254, + 230, 220, 221, 231, 222, 233, 61, 163, 163, 163, + 163, 163, 163, 163, 163, 163, 163, 223, 229, 232, + 235, 224, 163, 234, 1110, 249, 241, 244, 264, 1110, 163, 163, 163, 163, 163, 163, 69, 69, 167, 69, - 69, 69, 69, 69, 69, 69, 1102, 237, 1102, 238, - 1102, 69, 1102, 241, 1102, 1102, 1102, 1102, 1102, 69, - 69, 69, 69, 69, 69, 235, 1102, 246, 239, 1102, - 250, 253, 247, 251, 252, 236, 249, 1102, 242, 1102, - 259, 260, 254, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 256, 263, 258, 1102, 1102, 272, 271, 262, 1102, 69, - 69, 1102, 255, 268, 1102, 266, 269, 257, 261, 267, - 1102, 1102, 1102, 278, 264, 265, 271, 1102, 1102, 1102, - 273, 282, 270, 160, 160, 161, 160, 160, 160, 160, - - 160, 160, 160, 160, 160, 280, 160, 279, 281, 277, - 308, 1102, 274, 1102, 1102, 1102, 1102, 393, 303, 1102, - 160, 160, 160, 160, 160, 1102, 283, 289, 160, 1102, - 160, 160, 284, 285, 1102, 288, 293, 275, 286, 1102, - 1102, 1102, 287, 291, 290, 1102, 1102, 292, 298, 1102, - 1102, 69, 1102, 1102, 294, 1102, 300, 296, 297, 160, - 160, 160, 160, 304, 305, 306, 307, 299, 1102, 309, - 310, 1102, 311, 1102, 301, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 313, 312, - 302, 315, 317, 316, 318, 323, 1102, 314, 1102, 319, - - 321, 324, 326, 328, 330, 327, 1102, 333, 1102, 325, - 320, 1102, 1102, 322, 331, 1102, 329, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 338, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 336, 1102, 340, 343, 334, 339, 332, - 341, 344, 337, 346, 345, 350, 358, 351, 1102, 347, - 354, 335, 348, 1102, 349, 342, 355, 356, 1102, 361, - 1102, 359, 1102, 362, 1102, 352, 365, 366, 369, 370, - 373, 1102, 375, 353, 1102, 360, 1102, 363, 1102, 1102, - 1102, 1102, 372, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 357, 1102, 367, 368, 371, 379, 380, 376, 386, 374, - - 388, 1102, 1102, 377, 384, 389, 390, 391, 392, 1102, - 1102, 381, 1102, 382, 1102, 383, 378, 1102, 385, 387, - 394, 395, 396, 397, 1102, 1102, 1102, 403, 1102, 402, - 1102, 404, 401, 1102, 1102, 1102, 1102, 398, 405, 1102, - 406, 412, 407, 1102, 1102, 408, 1102, 414, 1102, 410, - 409, 416, 415, 1102, 1102, 418, 413, 1102, 411, 417, - 1102, 427, 424, 1102, 419, 1102, 422, 420, 1102, 426, - 430, 1102, 1102, 1102, 1102, 1102, 1102, 421, 428, 1102, - 431, 425, 1102, 437, 1102, 1102, 1102, 1102, 1102, 440, - 448, 429, 1102, 439, 443, 433, 434, 432, 435, 436, - - 1102, 442, 1102, 1102, 1102, 438, 441, 446, 1102, 445, - 1102, 1102, 1102, 449, 1102, 444, 1102, 452, 1102, 454, - 450, 453, 1102, 1102, 1102, 1102, 1102, 455, 1102, 459, - 1102, 1102, 1102, 458, 1102, 469, 470, 457, 1102, 462, - 456, 464, 468, 1102, 463, 1102, 465, 1102, 467, 460, - 1102, 466, 1102, 461, 1102, 473, 1102, 1102, 1102, 1102, - 1102, 475, 474, 1102, 472, 1102, 1102, 1102, 480, 486, - 1102, 483, 500, 1102, 1102, 476, 1102, 488, 1102, 490, - 481, 491, 509, 1102, 482, 1102, 493, 489, 495, 1102, - 498, 492, 499, 504, 1102, 494, 505, 501, 496, 503, - - 1102, 1102, 497, 506, 510, 508, 507, 1102, 502, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 512, - 511, 1102, 1102, 1102, 519, 1102, 1102, 1102, 513, 514, - 1102, 516, 515, 1102, 1102, 517, 1102, 521, 1102, 523, - 528, 529, 536, 518, 525, 520, 541, 526, 527, 531, - 532, 530, 522, 524, 533, 538, 1102, 1102, 535, 1102, - 537, 1102, 1102, 1102, 543, 1102, 1102, 1102, 539, 540, - 1102, 1102, 1102, 542, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 546, 548, 1102, 552, 1102, 1102, 1102, 544, 1102, - 551, 549, 554, 555, 1102, 545, 556, 1102, 562, 1102, - - 1102, 550, 1102, 547, 563, 560, 565, 553, 1102, 569, - 1102, 1102, 1102, 1102, 578, 1102, 570, 564, 566, 567, - 1102, 572, 579, 573, 571, 577, 568, 1102, 581, 1102, - 1102, 1102, 1102, 576, 574, 1102, 575, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 584, 1102, - 1102, 1102, 1102, 582, 590, 591, 592, 597, 1102, 585, - 598, 1102, 589, 583, 599, 600, 603, 1102, 601, 605, - 612, 606, 611, 608, 595, 613, 1102, 1102, 602, 610, - 1102, 614, 616, 1102, 609, 604, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 615, 1102, 1102, 1102, 1102, 1102, 1102, - - 1102, 1102, 1102, 1102, 618, 619, 1102, 621, 617, 625, - 636, 622, 626, 631, 632, 620, 1102, 627, 633, 623, - 630, 628, 1102, 1102, 1102, 1102, 638, 624, 629, 1102, - 1102, 1102, 637, 1102, 634, 1102, 640, 1102, 641, 1102, - 635, 639, 643, 1102, 642, 1102, 1102, 1102, 648, 649, - 1102, 1102, 1102, 646, 1102, 1102, 650, 647, 1102, 1102, - 653, 1102, 1102, 651, 645, 654, 1102, 659, 660, 655, - 1102, 661, 1102, 665, 662, 672, 656, 658, 1102, 657, - 669, 1102, 663, 667, 1102, 664, 1102, 668, 1102, 671, - 670, 1102, 666, 1102, 1102, 1102, 1102, 675, 1102, 1102, - - 680, 1102, 1102, 1102, 682, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 676, 685, 681, 683, 1102, 678, 688, 684, - 691, 696, 695, 679, 686, 1102, 694, 690, 1102, 689, - 1102, 687, 693, 1102, 1102, 1102, 1102, 701, 1102, 1102, - 1102, 1102, 697, 1102, 1102, 1102, 702, 1102, 1102, 706, - 709, 1102, 703, 711, 708, 1102, 719, 716, 1102, 718, - 710, 1102, 1102, 712, 1102, 713, 720, 1102, 724, 1102, - 1102, 714, 722, 721, 1102, 1102, 725, 1102, 717, 726, - 1102, 723, 1102, 727, 1102, 1102, 728, 730, 1102, 732, - 1102, 731, 733, 1102, 1102, 1102, 1102, 729, 734, 1102, - - 1102, 735, 1102, 736, 1102, 737, 1102, 1102, 1102, 739, - 753, 743, 754, 742, 1102, 747, 740, 738, 1102, 1102, - 745, 1102, 1102, 750, 1102, 746, 1102, 741, 744, 1102, - 1102, 748, 752, 1102, 751, 1102, 1102, 1102, 749, 757, - 1102, 758, 755, 1102, 756, 1102, 1102, 760, 767, 763, - 1102, 1102, 759, 764, 1102, 1102, 1102, 762, 1102, 1102, - 1102, 761, 1102, 765, 768, 1102, 766, 771, 1102, 1102, - 772, 770, 769, 1102, 1102, 1102, 1102, 781, 774, 777, - 1102, 1102, 782, 1102, 780, 783, 776, 775, 785, 779, - 784, 778, 788, 1102, 1102, 1102, 789, 794, 787, 1102, - - 796, 1102, 1102, 791, 1102, 1102, 797, 1102, 799, 1102, - 1102, 1102, 1102, 809, 1102, 1102, 1102, 1102, 1102, 803, - 798, 1102, 1102, 808, 1102, 1102, 812, 811, 1102, 804, - 1102, 805, 802, 1102, 810, 817, 801, 806, 813, 818, - 815, 816, 1102, 1102, 1102, 819, 807, 1102, 1102, 1102, - 1102, 1102, 1102, 814, 1102, 1102, 824, 822, 820, 1102, - 1102, 1102, 825, 1102, 821, 827, 828, 830, 826, 1102, - 1102, 1102, 832, 835, 1102, 823, 833, 829, 831, 1102, - 834, 1102, 1102, 1102, 1102, 1102, 839, 836, 843, 1102, - 842, 1102, 1102, 841, 846, 1102, 1102, 849, 1102, 1102, - - 1102, 1102, 848, 1102, 1102, 845, 840, 1102, 844, 1102, - 851, 1102, 853, 855, 857, 1102, 1102, 858, 852, 859, - 847, 1102, 850, 1102, 854, 860, 863, 1102, 862, 1102, - 1102, 856, 864, 861, 1102, 1102, 1102, 1102, 865, 1102, - 867, 871, 1102, 1102, 1102, 869, 1102, 1102, 1102, 875, - 892, 868, 1102, 877, 879, 880, 881, 882, 883, 884, - 885, 886, 873, 888, 1102, 1102, 887, 876, 889, 1102, - 1102, 1102, 1102, 891, 1102, 1102, 1102, 890, 898, 1102, - 1102, 899, 894, 895, 893, 900, 896, 897, 1102, 901, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - - 1102, 904, 1102, 905, 1102, 903, 902, 908, 1102, 909, - 910, 912, 914, 913, 917, 1102, 918, 1102, 1102, 1102, - 906, 907, 911, 922, 1102, 1102, 1102, 919, 1102, 920, - 921, 923, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 924, - 927, 1102, 1102, 1102, 1102, 925, 926, 1102, 931, 1102, - 929, 1102, 928, 934, 935, 930, 1102, 936, 939, 1102, - 1102, 1102, 1102, 941, 932, 933, 947, 945, 937, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 942, 1102, 1102, 1102, - 943, 1102, 1102, 950, 954, 951, 1102, 946, 949, 955, - 952, 948, 956, 953, 957, 1102, 1102, 1102, 1102, 1102, - - 1102, 1102, 959, 966, 961, 958, 960, 1102, 963, 1102, - 962, 968, 1102, 1102, 1102, 1102, 970, 972, 964, 965, - 967, 1102, 969, 1102, 1102, 974, 971, 1102, 1102, 973, - 1102, 1102, 1102, 1102, 975, 1102, 1102, 1102, 1102, 1102, - 1102, 981, 1102, 1102, 1102, 977, 983, 976, 985, 989, - 979, 993, 1102, 978, 987, 980, 986, 990, 984, 992, - 994, 988, 1102, 1102, 996, 1102, 1102, 1102, 1102, 1102, - 991, 1008, 1001, 1102, 1102, 1010, 1102, 1102, 1102, 1102, - 995, 998, 997, 999, 1000, 1002, 1006, 1003, 1007, 1102, - 1102, 1102, 1004, 1009, 1102, 1102, 1005, 1102, 1102, 1102, - - 1102, 1102, 1014, 1102, 1016, 1102, 1102, 1015, 1102, 1102, - 1102, 1102, 1102, 1012, 1011, 1018, 1013, 1102, 1023, 1102, - 1102, 1017, 1102, 1024, 1022, 1025, 1026, 1027, 1033, 1102, - 1102, 1102, 1019, 1102, 1102, 1020, 1021, 1035, 1102, 1102, - 1028, 1031, 1032, 1029, 1102, 1030, 1102, 1041, 1037, 1040, - 1102, 1102, 1102, 1034, 1102, 1102, 1038, 1102, 1045, 1039, - 1043, 1044, 1036, 1102, 1042, 1102, 1102, 1102, 1047, 1102, - 1102, 1102, 1052, 1102, 1102, 1048, 1102, 1102, 1046, 1102, - 1050, 1102, 1102, 1102, 1056, 1102, 1057, 1102, 1102, 1102, - 1053, 1049, 1061, 1060, 1051, 1054, 1102, 1059, 1055, 1064, - - 1065, 1066, 1067, 1070, 1062, 1068, 1069, 1058, 1102, 1102, - 1063, 1102, 1071, 1074, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1072, 1102, 1102, 1102, 1102, - 1073, 1075, 1080, 1081, 1102, 1102, 1076, 1102, 1077, 1082, - 1102, 1078, 1079, 1084, 1085, 1086, 1102, 1102, 1088, 1102, - 1083, 1087, 1102, 1102, 1102, 1091, 1089, 1098, 1099, 1100, - 1101, 1093, 1102, 1090, 1092, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1097, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1094, 1102, 1102, 1095, 1096, 59, 59, - 162, 162, 162, 160, 160, 160, 1102, 1102, 1102, 1102, - - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 982, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 944, 1102, 940, 1102, - 1102, 1102, 938, 1102, 1102, 1102, 1102, 1102, 1102, 916, - 915, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 878, 1102, - 874, 872, 870, 866, 1102, 1102, 1102, 838, 837, 1102, - 800, 1102, 1102, 1102, 795, 793, 792, 1102, 1102, 790, - 1102, 1102, 786, 1102, 1102, 1102, 1102, 1102, 773, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 715, 1102, 1102, - - 1102, 707, 705, 704, 1102, 700, 699, 698, 692, 1102, - 1102, 1102, 1102, 677, 674, 673, 652, 644, 1102, 607, - 1102, 1102, 596, 594, 593, 588, 587, 586, 580, 1102, - 561, 558, 557, 1102, 534, 1102, 487, 1102, 1102, 479, - 478, 477, 1102, 471, 1102, 1102, 1102, 451, 1102, 1102, - 1102, 447, 1102, 1102, 1102, 1102, 1102, 423, 1102, 1102, - 1102, 364, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 161, 1102, 1102, 1102, 158, 58, 157, - 135, 113, 110, 1102, 68, 67, 58, 1102, 3, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102 + 69, 69, 69, 69, 69, 69, 1110, 238, 1110, 239, + 1110, 69, 1110, 242, 1110, 406, 1110, 1110, 1110, 69, + 69, 69, 69, 69, 69, 236, 1110, 247, 240, 251, + 255, 1110, 252, 253, 1110, 237, 248, 1110, 243, 250, + 1110, 1110, 1110, 245, 257, 1110, 246, 259, 1110, 1110, + 256, 1110, 1110, 273, 263, 1110, 272, 1110, 69, 1110, + 262, 258, 69, 260, 261, 1110, 69, 267, 268, 269, + 1110, 1110, 270, 265, 279, 266, 272, 1110, 274, 271, + 160, 160, 161, 160, 160, 160, 160, 160, 160, 160, + + 160, 160, 278, 160, 281, 1110, 282, 292, 1110, 275, + 280, 1110, 1110, 1110, 1110, 303, 1110, 160, 160, 160, + 160, 160, 1110, 291, 1110, 160, 284, 160, 160, 285, + 286, 283, 1110, 289, 276, 287, 290, 294, 1110, 288, + 1110, 1110, 296, 1110, 1110, 293, 299, 1110, 1110, 1110, + 1110, 1110, 1110, 295, 298, 1110, 160, 160, 160, 160, + 297, 300, 301, 305, 306, 307, 308, 1110, 302, 310, + 313, 1110, 311, 1110, 1110, 1110, 1110, 1110, 1110, 304, + 1110, 309, 1110, 1110, 312, 1110, 1110, 1110, 314, 316, + 1110, 317, 319, 318, 1110, 1110, 1110, 315, 324, 320, + + 1110, 322, 327, 325, 1110, 328, 332, 326, 334, 1110, + 321, 1110, 329, 331, 323, 1110, 1110, 330, 1110, 1110, + 1110, 1110, 1110, 339, 1110, 1110, 1110, 1110, 1110, 337, + 1110, 1110, 1110, 333, 1110, 341, 342, 340, 335, 344, + 338, 345, 346, 347, 352, 1110, 351, 356, 357, 348, + 1110, 343, 336, 355, 1110, 1110, 1110, 349, 1110, 350, + 366, 359, 353, 1110, 367, 363, 368, 369, 1110, 364, + 354, 361, 374, 1110, 376, 1110, 360, 1110, 370, 371, + 1110, 358, 362, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 372, 1110, 1110, 381, 1110, 1110, 375, 373, 1110, 377, + + 1110, 380, 1110, 387, 1110, 378, 385, 389, 1110, 1110, + 1110, 386, 1110, 382, 1110, 383, 1110, 1110, 379, 384, + 468, 404, 388, 390, 391, 392, 393, 405, 402, 403, + 394, 395, 396, 397, 398, 1110, 399, 411, 413, 1110, + 1110, 412, 1110, 1110, 1110, 1110, 414, 407, 423, 408, + 1110, 1110, 409, 1110, 1110, 1110, 415, 410, 1110, 416, + 417, 1110, 419, 1110, 1110, 418, 1110, 425, 428, 1110, + 1110, 420, 427, 1110, 421, 432, 431, 1110, 1110, 429, + 1110, 1110, 426, 1110, 422, 438, 1110, 1110, 1110, 449, + 437, 1110, 430, 444, 434, 440, 436, 435, 433, 1110, + + 443, 441, 1110, 1110, 1110, 1110, 1110, 442, 1110, 439, + 1110, 446, 450, 1110, 1110, 1110, 1110, 445, 454, 447, + 1110, 453, 1110, 455, 1110, 1110, 1110, 460, 1110, 1110, + 1110, 456, 1110, 1110, 1110, 451, 459, 1110, 1110, 458, + 457, 463, 465, 1110, 469, 464, 1110, 466, 470, 471, + 1110, 461, 467, 462, 474, 1110, 1110, 476, 1110, 481, + 485, 486, 475, 473, 1110, 1110, 1110, 477, 1110, 1110, + 488, 490, 484, 482, 1110, 1110, 1110, 487, 483, 502, + 1110, 491, 1110, 1110, 1110, 492, 493, 1110, 1110, 495, + 506, 1110, 1110, 507, 500, 497, 501, 1110, 494, 508, + + 1110, 496, 509, 1110, 503, 511, 1110, 498, 499, 505, + 510, 1110, 1110, 512, 519, 504, 514, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 513, 1110, 523, 515, 516, 1110, + 521, 517, 1110, 1110, 1110, 518, 1110, 1110, 1110, 1110, + 530, 531, 1110, 543, 525, 1110, 1110, 1110, 527, 520, + 538, 522, 1110, 534, 529, 528, 1110, 524, 526, 532, + 533, 1110, 540, 535, 541, 539, 1110, 1110, 537, 1110, + 545, 1110, 546, 542, 1110, 1110, 1110, 1110, 544, 547, + 1110, 1110, 1110, 548, 1110, 1110, 550, 1110, 1110, 554, + 1110, 1110, 553, 1110, 1110, 551, 556, 1110, 1110, 557, + + 565, 558, 561, 1110, 1110, 552, 549, 1110, 1110, 1110, + 568, 1110, 555, 1110, 562, 566, 572, 581, 1110, 1110, + 573, 1110, 567, 1110, 576, 1110, 569, 575, 582, 570, + 571, 574, 584, 580, 1110, 577, 1110, 1110, 578, 579, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 585, 1110, 1110, 587, 1110, 1110, 1110, 593, 595, + 594, 1110, 601, 1110, 602, 1110, 1110, 588, 586, 592, + 607, 604, 603, 605, 610, 616, 609, 615, 617, 599, + 612, 1110, 613, 606, 620, 1110, 1110, 618, 1110, 1110, + 614, 608, 1110, 1110, 1110, 1110, 1110, 1110, 619, 1110, + + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 622, 1110, 625, + 1110, 623, 1110, 1110, 629, 635, 1110, 626, 630, 621, + 636, 624, 634, 631, 637, 638, 627, 632, 1110, 640, + 1110, 639, 628, 642, 633, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 649, 641, 1110, 1110, 643, 644, 645, + 647, 1110, 646, 652, 653, 1110, 1110, 1110, 654, 650, + 1110, 1110, 1110, 651, 1110, 655, 1110, 664, 1110, 657, + 1110, 1110, 1110, 663, 658, 1110, 672, 665, 659, 1110, + 666, 1110, 669, 662, 674, 660, 1110, 673, 661, 667, + 1110, 668, 671, 1110, 676, 1110, 1110, 1110, 679, 1110, + + 1110, 670, 1110, 1110, 1110, 675, 1110, 685, 1110, 687, + 680, 1110, 1110, 1110, 686, 1110, 1110, 690, 688, 683, + 1110, 693, 1110, 689, 1110, 696, 1110, 684, 691, 1110, + 700, 1110, 695, 694, 699, 692, 698, 1110, 701, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 706, 1110, 702, 1110, + 712, 708, 707, 1110, 715, 714, 1110, 717, 1110, 1110, + 1110, 722, 1110, 724, 1110, 716, 1110, 1110, 725, 718, + 719, 1110, 1110, 730, 720, 727, 1110, 728, 1110, 726, + 1110, 731, 723, 732, 738, 1110, 733, 1110, 734, 729, + 1110, 1110, 1110, 736, 1110, 737, 1110, 1110, 1110, 1110, + + 1110, 735, 1110, 739, 1110, 1110, 1110, 1110, 740, 1110, + 1110, 741, 742, 743, 1110, 745, 749, 748, 753, 744, + 751, 759, 746, 760, 1110, 756, 1110, 758, 1110, 752, + 1110, 747, 1110, 754, 750, 1110, 757, 1110, 1110, 755, + 1110, 1110, 1110, 1110, 1110, 763, 1110, 764, 761, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 762, 769, 766, 770, + 1110, 777, 773, 765, 1110, 768, 771, 767, 778, 772, + 1110, 774, 1110, 775, 1110, 1110, 776, 1110, 1110, 1110, + 780, 783, 1110, 1110, 1110, 782, 781, 1110, 1110, 787, + 789, 785, 788, 784, 790, 786, 794, 1110, 791, 1110, + + 804, 1110, 1110, 793, 795, 803, 1110, 1110, 1110, 797, + 1110, 1110, 1110, 801, 806, 1110, 1110, 1110, 816, 1110, + 1110, 1110, 1110, 1110, 810, 805, 1110, 1110, 815, 1110, + 1110, 818, 819, 811, 812, 1110, 1110, 809, 1110, 808, + 817, 1110, 820, 813, 824, 822, 823, 1110, 1110, 814, + 1110, 1110, 825, 826, 1110, 1110, 1110, 827, 821, 1110, + 831, 1110, 829, 828, 1110, 1110, 832, 1110, 834, 1110, + 1110, 833, 835, 1110, 830, 837, 1110, 839, 1110, 1110, + 842, 836, 838, 1110, 1110, 1110, 840, 841, 1110, 1110, + 1110, 1110, 1110, 846, 849, 843, 850, 853, 1110, 848, + + 1110, 1110, 856, 1110, 1110, 1110, 1110, 855, 1110, 852, + 847, 851, 1110, 1110, 1110, 1110, 1110, 858, 859, 864, + 860, 862, 865, 1110, 857, 854, 861, 869, 866, 867, + 870, 1110, 871, 863, 1110, 1110, 1110, 1110, 1110, 868, + 872, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 874, 1110, + 1110, 876, 1110, 883, 1110, 1110, 900, 898, 875, 885, + 887, 888, 889, 890, 891, 892, 893, 894, 878, 881, + 1110, 895, 896, 884, 897, 1110, 1110, 899, 906, 1110, + 1110, 1110, 1110, 1110, 907, 1110, 1110, 908, 902, 1110, + 901, 903, 904, 905, 1110, 1110, 1110, 1110, 1110, 909, + + 1110, 1110, 1110, 1110, 913, 1110, 1110, 912, 1110, 1110, + 1110, 911, 916, 910, 917, 920, 918, 921, 925, 1110, + 926, 922, 927, 919, 914, 915, 1110, 930, 1110, 1110, + 1110, 928, 1110, 1110, 1110, 1110, 1110, 1110, 931, 929, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 932, + 933, 934, 937, 1110, 943, 939, 1110, 942, 1110, 936, + 1110, 1110, 938, 944, 935, 947, 940, 941, 1110, 1110, + 1110, 1110, 953, 949, 1110, 945, 1110, 950, 954, 951, + 1110, 1110, 1110, 1110, 958, 955, 1110, 957, 1110, 962, + 956, 960, 959, 964, 961, 1110, 1110, 963, 965, 1110, + + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 967, 1110, 969, 966, 1110, 968, 976, 1110, 982, 970, + 1110, 974, 972, 971, 973, 975, 979, 977, 981, 1110, + 978, 1110, 983, 980, 1110, 1110, 1110, 1110, 1110, 984, + 1110, 986, 1110, 1110, 1110, 1110, 1110, 1110, 989, 1110, + 985, 1110, 1110, 991, 993, 1110, 987, 1004, 1001, 995, + 997, 988, 994, 998, 1000, 992, 996, 1002, 1110, 1110, + 1003, 1110, 1005, 1110, 1110, 1110, 999, 1110, 1110, 1110, + 1110, 1015, 1110, 1009, 1110, 1110, 1006, 1110, 1007, 1011, + 1008, 1010, 1110, 1110, 1012, 1014, 1110, 1110, 1013, 1017, + + 1022, 1110, 1110, 1110, 1110, 1024, 1110, 1110, 1110, 1016, + 1023, 1018, 1110, 1110, 1110, 1026, 1110, 1110, 1110, 1019, + 1020, 1021, 1110, 1025, 1031, 1110, 1032, 1110, 1030, 1033, + 1034, 1035, 1110, 1110, 1110, 1110, 1110, 1110, 1027, 1028, + 1029, 1039, 1041, 1036, 1110, 1110, 1110, 1043, 1040, 1037, + 1110, 1110, 1048, 1038, 1110, 1051, 1042, 1110, 1049, 1110, + 1044, 1045, 1046, 1047, 1110, 1110, 1053, 1052, 1055, 1110, + 1110, 1050, 1110, 1110, 1054, 1110, 1110, 1110, 1110, 1110, + 1056, 1110, 1060, 1110, 1110, 1110, 1110, 1058, 1110, 1110, + 1064, 1110, 1065, 1110, 1110, 1072, 1057, 1061, 1068, 1062, + + 1069, 1059, 1067, 1073, 1063, 1079, 1074, 1075, 1076, 1077, + 1070, 1080, 1078, 1066, 1081, 1071, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 1083, 1088, 1089, 1110, + 1084, 1090, 1085, 1093, 1099, 1086, 1087, 1082, 1092, 1094, + 1095, 1096, 1110, 1110, 1091, 1097, 1100, 1110, 1110, 1110, + 1110, 1098, 1106, 1107, 1108, 1109, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1105, 1110, 1110, 1110, 1110, 1110, 1110, 1101, + 1102, 1103, 1104, 59, 59, 162, 162, 162, 160, 160, + + 160, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 990, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 952, 1110, 948, 1110, 1110, 1110, 946, 1110, 1110, + 1110, 1110, 1110, 1110, 924, 923, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 886, 1110, 882, 880, 879, 877, 873, + 1110, 1110, 1110, 845, 844, 1110, 807, 1110, 1110, 1110, + 802, 800, 799, 798, 1110, 1110, 796, 1110, 1110, 792, + 1110, 1110, 1110, 1110, 1110, 779, 1110, 1110, 1110, 1110, + + 1110, 1110, 1110, 1110, 721, 1110, 1110, 1110, 713, 711, + 710, 709, 1110, 705, 704, 703, 697, 1110, 1110, 1110, + 1110, 682, 681, 678, 677, 656, 648, 1110, 611, 1110, + 1110, 600, 598, 597, 596, 591, 590, 589, 583, 1110, + 560, 559, 1110, 536, 1110, 489, 1110, 1110, 480, 479, + 478, 1110, 472, 1110, 1110, 1110, 452, 1110, 1110, 1110, + 448, 1110, 1110, 1110, 1110, 1110, 424, 1110, 1110, 1110, + 365, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 161, 1110, 1110, 158, 58, 157, 135, + 113, 110, 1110, 68, 67, 58, 1110, 3, 1110, 1110, + + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110 } ; -static yyconst flex_int16_t yy_chk[2360] = +static yyconst flex_int16_t yy_chk[2369] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1110,14 +1113,14 @@ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 18, 20, 5, 8, 8, 18, 8, 8, 8, 8, 41, 8, 76, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 41, 50, 276, + 8, 8, 8, 8, 8, 8, 8, 41, 50, 277, - 276, 20, 8, 8, 8, 50, 8, 76, 8, 8, + 277, 20, 8, 8, 8, 50, 8, 76, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 34, 35, 34, 86, - 34, 19, 38, 19, 1103, 44, 38, 34, 35, 19, + 34, 19, 38, 19, 1111, 44, 38, 34, 35, 19, 19, 19, 19, 19, 19, 39, 43, 43, 43, 44, 57, 75, 64, 57, 39, 39, 43, 86, 43, 60, 83, 79, 19, 26, 43, 26, 26, 26, 26, 26, @@ -1128,7 +1131,7 @@ 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 77, 70, 32, - 80, 32, 27, 115, 81, 373, 373, 1101, 115, 45, + 80, 32, 27, 115, 81, 452, 452, 1109, 115, 45, 27, 27, 27, 27, 27, 27, 32, 32, 70, 45, 32, 32, 45, 33, 72, 32, 45, 37, 32, 33, 33, 72, 80, 33, 74, 37, 33, 32, 36, 37, @@ -1146,223 +1149,224 @@ 63, 63, 96, 99, 105, 63, 107, 63, 63, 103, 108, 101, 109, 118, 110, 111, 106, 105, 107, 113, - 99, 1100, 102, 108, 114, 112, 95, 110, 116, 118, + 99, 1108, 102, 108, 114, 112, 95, 110, 116, 118, 119, 123, 113, 109, 124, 125, 63, 63, 63, 63, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 106, 117, 111, 112, 119, 114, 120, 65, 122, 127, - 116, 125, 124, 123, 137, 449, 117, 128, 126, 1099, - 130, 121, 186, 1098, 138, 141, 122, 131, 135, 449, + 116, 125, 124, 123, 144, 1107, 117, 128, 126, 1106, + 130, 121, 137, 141, 129, 151, 122, 131, 135, 144, 127, 120, 120, 128, 121, 130, 65, 66, 66, 66, - 66, 66, 66, 66, 66, 66, 66, 121, 126, 137, - 131, 121, 66, 130, 133, 138, 135, 141, 138, 186, + 66, 66, 66, 66, 66, 66, 66, 121, 126, 129, + 131, 121, 66, 130, 133, 141, 135, 137, 151, 282, 66, 66, 66, 66, 66, 66, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 133, 132, 133, - 134, 73, 140, 136, 139, 142, 144, 148, 151, 73, - 73, 73, 73, 73, 73, 132, 136, 139, 134, 145, - 143, 144, 140, 143, 143, 132, 142, 146, 136, 147, - 148, 148, 145, 143, 150, 149, 152, 154, 153, 156, - 146, 151, 147, 155, 157, 165, 159, 150, 169, 170, - 165, 174, 145, 156, 168, 154, 156, 146, 149, 155, - 196, 273, 171, 169, 152, 153, 159, 194, 1097, 173, - 165, 174, 157, 162, 162, 162, 162, 162, 162, 162, - - 162, 162, 162, 162, 162, 171, 162, 170, 173, 168, - 196, 181, 166, 175, 177, 178, 189, 273, 194, 176, - 162, 162, 162, 162, 162, 166, 175, 178, 162, 180, - 162, 162, 176, 176, 182, 177, 184, 166, 176, 185, - 187, 191, 176, 181, 180, 188, 190, 182, 189, 184, - 192, 193, 197, 198, 185, 199, 191, 187, 188, 162, - 162, 162, 162, 195, 195, 195, 195, 190, 200, 197, - 198, 201, 199, 203, 192, 206, 204, 205, 209, 207, - 208, 210, 211, 212, 219, 213, 218, 220, 201, 200, - 193, 204, 206, 205, 207, 212, 216, 203, 221, 208, - - 210, 213, 217, 218, 220, 217, 222, 223, 224, 216, - 209, 225, 226, 211, 221, 217, 219, 227, 228, 230, - 223, 235, 236, 229, 226, 232, 233, 237, 247, 240, - 242, 234, 245, 224, 1096, 228, 230, 223, 227, 222, - 229, 232, 225, 234, 233, 237, 242, 239, 256, 234, - 240, 223, 235, 239, 236, 229, 241, 241, 244, 245, - 253, 242, 255, 247, 248, 239, 251, 252, 254, 254, - 257, 258, 259, 239, 260, 244, 254, 248, 261, 251, - 252, 262, 256, 257, 263, 259, 266, 264, 270, 269, - 241, 265, 253, 253, 255, 260, 261, 259, 266, 258, - - 270, 275, 277, 259, 264, 272, 272, 272, 272, 278, - 279, 262, 281, 262, 280, 263, 259, 285, 265, 269, - 274, 274, 274, 274, 283, 284, 286, 279, 282, 278, - 287, 280, 277, 288, 289, 292, 290, 275, 281, 294, - 282, 285, 282, 291, 297, 282, 299, 287, 298, 283, - 282, 289, 288, 300, 301, 291, 286, 302, 284, 290, - 308, 299, 294, 303, 291, 309, 292, 291, 310, 298, - 302, 314, 311, 315, 317, 312, 316, 291, 300, 318, - 303, 297, 321, 314, 319, 322, 323, 325, 332, 317, - 327, 301, 329, 316, 321, 309, 310, 308, 311, 312, - - 335, 319, 337, 327, 338, 315, 318, 325, 336, 323, - 340, 341, 342, 329, 345, 322, 344, 335, 347, 337, - 332, 336, 346, 348, 349, 350, 353, 338, 351, 344, - 352, 358, 360, 342, 359, 354, 354, 341, 361, 347, - 340, 349, 353, 354, 348, 362, 350, 367, 352, 345, - 368, 351, 371, 346, 372, 359, 376, 374, 377, 379, - 378, 361, 360, 381, 358, 380, 383, 382, 367, 374, - 385, 372, 387, 403, 388, 362, 386, 376, 401, 377, - 368, 378, 402, 404, 371, 387, 380, 376, 382, 402, - 386, 379, 386, 393, 405, 381, 393, 387, 383, 388, - - 393, 406, 385, 398, 403, 401, 398, 407, 387, 408, - 398, 409, 410, 411, 412, 413, 414, 417, 415, 405, - 404, 416, 420, 422, 410, 418, 419, 424, 406, 406, - 425, 407, 406, 421, 426, 408, 432, 412, 427, 414, - 418, 418, 425, 409, 415, 411, 430, 416, 417, 420, - 421, 419, 413, 414, 422, 427, 428, 429, 424, 430, - 426, 431, 433, 434, 432, 435, 436, 437, 428, 429, - 438, 439, 442, 431, 441, 443, 445, 444, 450, 446, - 453, 435, 437, 452, 442, 454, 457, 458, 433, 455, - 441, 438, 444, 445, 459, 434, 446, 460, 452, 461, - - 462, 439, 463, 436, 453, 450, 455, 443, 464, 460, - 465, 466, 467, 468, 469, 472, 461, 454, 457, 458, - 469, 463, 470, 464, 462, 468, 459, 473, 472, 474, - 470, 475, 476, 467, 465, 480, 466, 481, 482, 486, - 490, 488, 483, 489, 493, 494, 491, 496, 475, 498, - 501, 495, 503, 473, 481, 482, 483, 488, 499, 476, - 489, 508, 480, 474, 490, 491, 495, 502, 493, 498, - 505, 499, 504, 501, 486, 506, 505, 510, 494, 503, - 504, 507, 509, 506, 502, 496, 511, 507, 512, 513, - 509, 515, 516, 508, 514, 517, 518, 525, 519, 528, - - 520, 521, 522, 1095, 511, 512, 523, 514, 510, 518, - 525, 515, 519, 521, 522, 513, 526, 519, 523, 516, - 520, 519, 524, 530, 529, 531, 528, 517, 519, 532, - 533, 535, 526, 536, 524, 537, 530, 538, 531, 539, - 524, 529, 533, 540, 532, 543, 542, 545, 537, 538, - 544, 547, 555, 536, 546, 548, 539, 536, 549, 553, - 542, 550, 556, 540, 535, 542, 551, 544, 545, 542, - 559, 546, 552, 550, 547, 556, 542, 543, 554, 542, - 553, 560, 548, 551, 562, 549, 565, 552, 566, 555, - 554, 568, 550, 567, 569, 570, 571, 559, 572, 573, - - 566, 574, 575, 576, 568, 583, 577, 582, 581, 584, - 585, 589, 560, 571, 567, 569, 591, 562, 574, 570, - 577, 584, 583, 565, 572, 592, 582, 576, 595, 575, - 598, 573, 581, 599, 600, 602, 601, 589, 604, 606, - 608, 609, 585, 610, 616, 618, 591, 619, 620, 595, - 599, 621, 592, 601, 598, 622, 616, 608, 624, 610, - 600, 623, 626, 602, 625, 604, 618, 627, 622, 631, - 628, 606, 620, 619, 629, 632, 623, 630, 609, 624, - 633, 621, 634, 625, 635, 636, 626, 628, 637, 630, - 638, 629, 631, 639, 640, 641, 642, 627, 632, 643, - - 645, 633, 646, 634, 647, 635, 648, 649, 650, 637, - 652, 641, 652, 640, 654, 646, 638, 636, 653, 651, - 643, 657, 655, 649, 656, 645, 658, 639, 642, 659, - 660, 647, 651, 661, 650, 665, 662, 663, 648, 655, - 664, 656, 653, 666, 654, 668, 669, 658, 665, 661, - 670, 675, 657, 662, 672, 676, 678, 660, 680, 683, - 684, 659, 681, 663, 666, 687, 664, 670, 691, 689, - 672, 669, 668, 690, 694, 696, 703, 684, 675, 680, - 695, 706, 687, 708, 683, 689, 678, 676, 691, 681, - 690, 680, 695, 710, 713, 714, 696, 706, 694, 716, - - 708, 717, 718, 703, 719, 721, 710, 720, 714, 722, - 723, 725, 726, 724, 727, 728, 729, 730, 732, 718, - 713, 724, 733, 723, 735, 731, 727, 726, 734, 719, - 736, 720, 717, 737, 725, 732, 716, 721, 728, 733, - 730, 731, 738, 739, 740, 734, 722, 741, 742, 743, - 744, 745, 747, 729, 750, 749, 739, 737, 735, 748, - 751, 752, 740, 755, 736, 742, 743, 745, 741, 756, - 757, 759, 748, 751, 758, 738, 749, 744, 747, 762, - 750, 760, 763, 764, 765, 766, 755, 752, 759, 767, - 758, 768, 769, 757, 763, 770, 772, 766, 771, 774, - - 776, 775, 765, 777, 778, 762, 756, 779, 760, 791, - 768, 781, 770, 772, 775, 780, 782, 776, 769, 777, - 764, 783, 767, 787, 771, 778, 781, 788, 780, 789, - 794, 774, 782, 779, 796, 797, 798, 811, 783, 804, - 787, 791, 810, 808, 818, 789, 805, 1092, 819, 796, - 811, 788, 817, 798, 801, 801, 801, 801, 801, 801, - 801, 801, 794, 805, 801, 809, 804, 797, 808, 812, - 813, 814, 822, 810, 815, 816, 823, 809, 817, 824, - 825, 818, 813, 814, 812, 819, 815, 816, 826, 822, - 828, 829, 830, 831, 832, 833, 836, 844, 834, 835, - - 843, 825, 839, 826, 840, 824, 823, 830, 850, 831, - 832, 834, 836, 835, 839, 841, 840, 842, 846, 845, - 828, 829, 833, 844, 848, 849, 851, 841, 853, 842, - 843, 845, 852, 854, 855, 857, 863, 860, 862, 846, - 850, 868, 861, 873, 875, 848, 849, 876, 854, 890, - 852, 887, 851, 860, 861, 853, 889, 862, 868, 892, - 894, 893, 895, 873, 855, 857, 890, 887, 863, 896, - 897, 898, 902, 904, 907, 908, 875, 905, 911, 909, - 876, 914, 919, 894, 898, 895, 913, 889, 893, 902, - 896, 892, 904, 897, 905, 917, 918, 920, 923, 921, - - 924, 926, 908, 919, 911, 907, 909, 925, 914, 927, - 913, 921, 928, 929, 930, 931, 924, 926, 917, 918, - 920, 933, 923, 935, 936, 928, 925, 939, 943, 927, - 947, 945, 950, 948, 929, 949, 952, 954, 966, 974, - 951, 936, 953, 976, 959, 931, 939, 930, 945, 950, - 935, 954, 961, 933, 948, 935, 947, 951, 943, 953, - 959, 949, 960, 963, 961, 962, 964, 965, 967, 969, - 952, 974, 966, 968, 975, 976, 970, 977, 979, 980, - 960, 963, 962, 964, 965, 967, 969, 968, 970, 983, - 984, 986, 968, 975, 987, 989, 968, 988, 990, 992, - - 993, 994, 983, 999, 986, 995, 1000, 984, 1002, 998, - 996, 1005, 1004, 979, 977, 988, 980, 1003, 994, 1006, - 1011, 987, 1007, 995, 993, 996, 996, 998, 1005, 1008, - 1012, 1013, 989, 1016, 1014, 990, 992, 1007, 1017, 1018, - 999, 1003, 1004, 1000, 1022, 1002, 1023, 1016, 1011, 1014, - 1025, 1026, 1031, 1006, 1032, 1034, 1012, 1033, 1023, 1013, - 1018, 1022, 1008, 1035, 1017, 1036, 1037, 1038, 1026, 1039, - 1040, 1046, 1034, 1041, 1043, 1031, 1047, 1045, 1025, 1052, - 1033, 1090, 1082, 1056, 1038, 1075, 1039, 1048, 1049, 1074, - 1035, 1032, 1045, 1043, 1033, 1036, 1053, 1041, 1037, 1048, - - 1049, 1050, 1050, 1052, 1046, 1051, 1051, 1040, 1054, 1055, - 1047, 1050, 1053, 1056, 1059, 1051, 1061, 1063, 1064, 1065, - 1066, 1067, 1071, 1073, 1086, 1054, 1076, 1080, 1078, 1077, - 1055, 1059, 1066, 1067, 1079, 1081, 1061, 1083, 1063, 1071, - 1084, 1064, 1065, 1076, 1077, 1078, 1087, 1085, 1080, 1091, - 1073, 1079, 1088, 1089, 1072, 1084, 1081, 1093, 1093, 1094, - 1094, 1086, 1070, 1083, 1085, 1069, 1068, 1093, 1062, 1094, - 1060, 1058, 1091, 1057, 1044, 1042, 1030, 1029, 1028, 1027, - 1024, 1021, 1020, 1087, 1019, 1015, 1088, 1089, 1104, 1104, - 1105, 1105, 1105, 1106, 1106, 1106, 1010, 1009, 1001, 997, - - 991, 985, 981, 978, 973, 972, 971, 958, 957, 956, - 955, 946, 942, 941, 938, 937, 934, 932, 922, 912, - 910, 906, 903, 901, 900, 899, 891, 888, 886, 885, - 884, 883, 882, 881, 880, 879, 878, 877, 872, 871, - 869, 867, 866, 865, 864, 859, 858, 856, 847, 838, - 837, 827, 821, 820, 807, 806, 803, 802, 800, 799, - 795, 793, 790, 786, 785, 784, 761, 754, 753, 746, - 715, 712, 711, 709, 707, 705, 704, 702, 701, 698, - 697, 693, 692, 688, 686, 685, 682, 679, 674, 671, - 667, 617, 615, 614, 613, 612, 611, 607, 605, 603, - - 597, 596, 594, 593, 590, 588, 587, 586, 580, 579, - 578, 564, 563, 561, 558, 557, 541, 534, 527, 500, - 497, 492, 487, 485, 484, 479, 478, 477, 471, 456, - 451, 448, 447, 440, 423, 384, 375, 370, 369, 366, - 365, 364, 363, 357, 343, 339, 334, 333, 331, 330, - 328, 326, 324, 320, 313, 296, 295, 293, 271, 268, - 267, 250, 249, 246, 243, 238, 231, 215, 214, 202, - 183, 179, 172, 160, 129, 71, 69, 59, 58, 52, - 47, 42, 40, 31, 25, 23, 6, 3, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102 + 134, 73, 138, 136, 139, 282, 140, 145, 142, 73, + 73, 73, 73, 73, 73, 132, 136, 139, 134, 143, + 145, 146, 143, 143, 147, 132, 140, 149, 136, 142, + 148, 150, 143, 138, 146, 152, 138, 147, 153, 154, + 145, 157, 155, 165, 150, 156, 159, 168, 165, 169, + 149, 146, 170, 148, 148, 181, 193, 154, 155, 156, + 1105, 171, 156, 152, 169, 153, 159, 173, 165, 157, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, + + 162, 162, 168, 162, 171, 186, 173, 181, 180, 166, + 170, 174, 177, 175, 189, 193, 176, 162, 162, 162, + 162, 162, 166, 180, 178, 162, 175, 162, 162, 176, + 176, 174, 182, 177, 166, 176, 178, 184, 185, 176, + 190, 188, 186, 187, 192, 182, 189, 191, 194, 200, + 184, 196, 197, 185, 188, 198, 162, 162, 162, 162, + 187, 190, 191, 195, 195, 195, 195, 199, 192, 197, + 200, 201, 198, 203, 204, 205, 206, 207, 209, 194, + 208, 196, 210, 211, 199, 219, 212, 213, 201, 204, + 221, 205, 207, 206, 216, 218, 220, 203, 212, 208, + + 222, 210, 217, 213, 224, 217, 221, 216, 223, 225, + 209, 226, 218, 220, 211, 217, 227, 219, 228, 229, + 1104, 223, 230, 226, 234, 233, 236, 237, 238, 224, + 248, 235, 241, 222, 254, 228, 229, 227, 223, 230, + 225, 233, 234, 235, 240, 243, 238, 242, 242, 235, + 240, 229, 223, 241, 245, 246, 249, 236, 256, 237, + 252, 243, 240, 257, 253, 248, 254, 254, 259, 249, + 240, 245, 258, 252, 260, 262, 243, 253, 255, 255, + 261, 242, 246, 263, 266, 258, 255, 260, 264, 265, + 256, 267, 270, 262, 274, 271, 259, 257, 278, 260, + + 276, 261, 353, 267, 280, 260, 265, 271, 285, 279, + 281, 266, 284, 263, 286, 263, 287, 293, 260, 264, + 353, 280, 270, 273, 273, 273, 273, 281, 278, 279, + 274, 275, 275, 275, 275, 283, 276, 284, 286, 288, + 289, 285, 291, 290, 295, 298, 287, 283, 293, 283, + 292, 299, 283, 300, 301, 302, 288, 283, 304, 289, + 290, 309, 292, 303, 310, 291, 313, 295, 300, 311, + 312, 292, 299, 315, 292, 304, 303, 316, 317, 301, + 319, 322, 298, 320, 292, 315, 318, 323, 324, 328, + 313, 330, 302, 322, 310, 317, 312, 311, 309, 326, + + 320, 318, 328, 333, 336, 337, 338, 319, 339, 316, + 341, 324, 330, 342, 345, 343, 346, 323, 337, 326, + 348, 336, 347, 338, 349, 350, 351, 345, 354, 352, + 359, 339, 361, 360, 362, 333, 343, 363, 368, 342, + 341, 348, 350, 369, 354, 349, 372, 351, 355, 355, + 377, 346, 352, 347, 360, 373, 355, 362, 375, 368, + 374, 374, 361, 359, 378, 379, 380, 363, 381, 382, + 375, 377, 373, 369, 383, 384, 386, 374, 372, 388, + 387, 377, 404, 402, 389, 378, 379, 405, 409, 381, + 394, 406, 388, 394, 387, 383, 387, 394, 380, 399, + + 407, 382, 399, 413, 388, 403, 399, 384, 386, 389, + 402, 408, 403, 404, 409, 388, 406, 410, 411, 412, + 414, 415, 416, 418, 405, 419, 413, 407, 407, 417, + 411, 407, 423, 421, 420, 408, 422, 425, 426, 427, + 419, 419, 433, 431, 415, 428, 434, 435, 416, 410, + 426, 412, 429, 422, 418, 417, 431, 414, 415, 420, + 421, 430, 428, 423, 429, 427, 432, 436, 425, 437, + 433, 438, 434, 430, 439, 440, 442, 443, 432, 435, + 444, 445, 446, 436, 447, 453, 438, 451, 450, 443, + 455, 454, 442, 456, 458, 439, 445, 459, 460, 446, + + 453, 447, 450, 462, 461, 440, 437, 463, 464, 465, + 456, 466, 444, 467, 451, 454, 461, 470, 468, 473, + 462, 469, 455, 470, 465, 474, 458, 464, 471, 459, + 460, 463, 473, 469, 475, 466, 471, 476, 467, 468, + 477, 482, 481, 483, 488, 484, 490, 491, 492, 495, + 496, 474, 493, 498, 476, 497, 500, 503, 482, 484, + 483, 501, 490, 505, 491, 504, 510, 477, 475, 481, + 497, 493, 492, 495, 501, 507, 500, 506, 508, 488, + 503, 507, 504, 496, 511, 506, 508, 509, 512, 513, + 505, 498, 511, 509, 514, 515, 516, 517, 510, 518, + + 519, 520, 522, 523, 521, 1103, 530, 513, 524, 516, + 537, 514, 525, 526, 520, 523, 527, 517, 521, 512, + 524, 515, 522, 521, 525, 526, 518, 521, 528, 527, + 531, 526, 519, 530, 521, 532, 533, 534, 535, 538, + 539, 541, 540, 537, 528, 542, 547, 531, 532, 533, + 535, 545, 534, 539, 540, 544, 546, 549, 541, 538, + 548, 554, 550, 538, 551, 542, 555, 547, 557, 544, + 552, 561, 556, 546, 544, 553, 554, 548, 544, 562, + 549, 558, 552, 545, 556, 544, 565, 555, 544, 550, + 568, 551, 553, 570, 558, 569, 571, 572, 561, 573, + + 574, 552, 575, 576, 577, 557, 578, 569, 579, 571, + 562, 580, 584, 586, 570, 585, 588, 574, 572, 565, + 592, 577, 594, 573, 595, 580, 587, 568, 575, 599, + 586, 602, 579, 578, 585, 576, 584, 603, 587, 604, + 605, 606, 610, 608, 612, 613, 592, 614, 588, 623, + 599, 595, 594, 624, 603, 602, 620, 605, 622, 625, + 626, 612, 628, 614, 630, 604, 627, 629, 620, 606, + 608, 631, 634, 626, 610, 623, 632, 624, 633, 622, + 635, 627, 613, 628, 634, 636, 629, 640, 630, 625, + 637, 638, 639, 632, 641, 633, 642, 643, 644, 647, + + 645, 631, 646, 635, 649, 650, 651, 652, 636, 653, + 654, 637, 638, 639, 655, 641, 645, 644, 650, 640, + 647, 656, 642, 656, 657, 653, 658, 655, 659, 649, + 660, 643, 661, 651, 646, 663, 654, 662, 664, 652, + 667, 665, 666, 668, 674, 659, 672, 660, 657, 669, + 670, 673, 676, 679, 680, 683, 658, 665, 662, 666, + 685, 674, 669, 661, 686, 664, 667, 663, 676, 668, + 688, 670, 689, 672, 694, 692, 673, 695, 696, 699, + 679, 685, 708, 701, 700, 683, 680, 716, 714, 689, + 694, 686, 692, 685, 695, 688, 700, 712, 696, 719, + + 716, 720, 722, 699, 701, 714, 723, 724, 725, 708, + 726, 727, 728, 712, 720, 729, 732, 731, 730, 734, + 733, 735, 736, 741, 724, 719, 730, 738, 729, 742, + 737, 732, 733, 725, 726, 739, 740, 723, 743, 722, + 731, 744, 734, 727, 738, 736, 737, 745, 746, 728, + 747, 748, 739, 740, 750, 749, 753, 741, 735, 751, + 745, 756, 743, 742, 754, 755, 746, 757, 748, 758, + 761, 747, 749, 762, 744, 751, 763, 754, 764, 765, + 757, 750, 753, 768, 766, 769, 755, 756, 770, 771, + 772, 773, 775, 761, 764, 758, 765, 769, 774, 763, + + 777, 780, 772, 776, 778, 782, 781, 771, 784, 768, + 762, 766, 783, 785, 786, 787, 788, 774, 775, 781, + 776, 778, 782, 789, 773, 770, 777, 786, 783, 784, + 787, 793, 788, 780, 794, 795, 797, 801, 803, 785, + 789, 804, 805, 818, 811, 816, 817, 825, 793, 815, + 826, 795, 824, 803, 1100, 812, 818, 816, 794, 805, + 808, 808, 808, 808, 808, 808, 808, 808, 797, 801, + 808, 811, 812, 804, 815, 819, 820, 817, 824, 821, + 822, 823, 829, 830, 825, 831, 832, 826, 820, 833, + 819, 821, 822, 823, 835, 836, 840, 837, 838, 829, + + 839, 851, 841, 842, 833, 843, 846, 832, 847, 850, + 848, 831, 837, 830, 838, 841, 839, 842, 846, 849, + 847, 843, 848, 840, 835, 836, 852, 851, 853, 855, + 856, 849, 857, 858, 859, 860, 862, 864, 852, 850, + 861, 867, 868, 870, 869, 883, 884, 897, 875, 853, + 855, 856, 859, 881, 868, 861, 895, 867, 900, 858, + 901, 902, 860, 869, 857, 875, 862, 864, 898, 903, + 904, 905, 895, 881, 912, 870, 906, 883, 897, 884, + 910, 913, 915, 916, 902, 898, 919, 901, 917, 906, + 900, 904, 903, 912, 905, 921, 922, 910, 913, 925, + + 927, 926, 928, 931, 929, 936, 938, 933, 935, 941, + 916, 937, 919, 915, 932, 917, 929, 934, 936, 921, + 939, 927, 925, 922, 926, 928, 933, 931, 935, 943, + 932, 944, 937, 934, 947, 951, 955, 953, 956, 938, + 957, 941, 960, 958, 962, 969, 959, 961, 944, 974, + 939, 967, 968, 947, 953, 970, 943, 969, 962, 956, + 958, 943, 955, 959, 961, 951, 957, 967, 971, 978, + 968, 972, 970, 973, 975, 976, 960, 982, 977, 984, + 983, 978, 985, 974, 988, 987, 971, 991, 972, 976, + 973, 975, 994, 992, 976, 977, 995, 996, 976, 983, + + 991, 997, 998, 1000, 1001, 994, 1007, 1002, 1003, 982, + 992, 984, 1008, 1006, 1004, 996, 1010, 1011, 1012, 985, + 987, 988, 1014, 995, 1002, 1013, 1003, 1016, 1001, 1004, + 1004, 1006, 1015, 1019, 1026, 1021, 1020, 1022, 997, 998, + 1000, 1011, 1013, 1007, 1024, 1025, 1033, 1015, 1012, 1008, + 1030, 1034, 1022, 1010, 1031, 1026, 1014, 1039, 1024, 1040, + 1016, 1019, 1020, 1021, 1041, 1042, 1031, 1030, 1034, 1044, + 1043, 1025, 1045, 1046, 1033, 1047, 1048, 1054, 1049, 1051, + 1039, 1055, 1042, 1056, 1098, 1053, 1090, 1041, 1060, 1061, + 1046, 1057, 1047, 1063, 1062, 1056, 1040, 1043, 1051, 1044, + + 1053, 1041, 1049, 1057, 1045, 1061, 1058, 1058, 1059, 1059, + 1054, 1062, 1060, 1048, 1063, 1055, 1058, 1064, 1059, 1067, + 1069, 1071, 1072, 1073, 1079, 1074, 1075, 1081, 1085, 1092, + 1088, 1084, 1086, 1087, 1089, 1091, 1067, 1074, 1075, 1093, + 1069, 1079, 1071, 1085, 1092, 1072, 1073, 1064, 1084, 1086, + 1087, 1088, 1094, 1095, 1081, 1089, 1093, 1096, 1097, 1099, + 1083, 1091, 1101, 1101, 1102, 1102, 1082, 1080, 1078, 1077, + 1076, 1070, 1101, 1068, 1102, 1066, 1065, 1052, 1050, 1038, + 1037, 1036, 1099, 1035, 1032, 1029, 1028, 1027, 1023, 1094, + 1095, 1096, 1097, 1112, 1112, 1113, 1113, 1113, 1114, 1114, + + 1114, 1018, 1017, 1009, 1005, 999, 993, 989, 986, 981, + 980, 979, 966, 965, 964, 963, 954, 950, 949, 946, + 945, 942, 940, 930, 920, 918, 914, 911, 909, 908, + 907, 899, 896, 894, 893, 892, 891, 890, 889, 888, + 887, 886, 885, 879, 878, 876, 874, 873, 872, 871, + 866, 865, 863, 854, 845, 844, 834, 828, 827, 814, + 813, 810, 809, 807, 806, 802, 800, 799, 796, 792, + 791, 790, 767, 760, 759, 752, 721, 718, 717, 715, + 713, 711, 710, 709, 707, 706, 703, 702, 698, 697, + 693, 691, 690, 687, 684, 678, 675, 671, 621, 619, + + 618, 617, 616, 615, 611, 609, 607, 601, 600, 598, + 597, 596, 593, 591, 590, 589, 583, 582, 581, 567, + 566, 564, 563, 560, 559, 543, 536, 529, 502, 499, + 494, 489, 487, 486, 485, 480, 479, 478, 472, 457, + 449, 448, 441, 424, 385, 376, 371, 370, 367, 366, + 365, 364, 358, 344, 340, 335, 334, 332, 331, 329, + 327, 325, 321, 314, 297, 296, 294, 272, 269, 268, + 251, 250, 247, 244, 239, 232, 231, 215, 214, 202, + 183, 179, 172, 160, 71, 69, 59, 58, 52, 47, + 42, 40, 31, 25, 23, 6, 3, 1110, 1110, 1110, + + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110 } ; -static yyconst flex_int16_t yy_rule_linenum[244] = +static yyconst flex_int16_t yy_rule_linenum[247] = { 0, 44, 45, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, @@ -1372,25 +1376,25 @@ 96, 97, 98, 99, 100, 101, 102, 103, 105, 106, 107, 108, 109, 110, 112, 114, 115, 116, 118, 119, 120, 121, 122, 124, 125, 126, 127, 129, 130, 131, - 132, 133, 134, 136, 137, 138, 139, 140, 141, 142, - 143, 145, 146, 147, 148, 149, 150, 151, 152, 153, + 132, 133, 134, 135, 136, 138, 139, 140, 141, 142, + 143, 144, 145, 146, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, - 164, 165, 166, 167, 168, 169, 170, 171, 173, 174, - 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 191, 192, 193, 195, - 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, + 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, + 174, 176, 177, 178, 179, 180, 181, 182, 183, 184, + 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, + 195, 196, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, - 216, 218, 219, 220, 221, 222, 223, 224, 225, 226, - 227, 228, 229, 230, 231, 232, 233, 234, 235, 237, - 238, 239, 240, 241, 243, 244, 245, 246, 247, 249, - 250, 251, 253, 255, 256, 257, 258, 259, 260, 261, - - 263, 265, 266, 267, 268, 269, 270, 271, 273, 274, - 275, 277, 278, 279, 281, 282, 283, 284, 285, 286, - 287, 288, 289, 290, 291, 293, 294, 295, 296, 297, - 298, 299, 300, 301, 302, 303, 305, 306, 307, 309, - 310, 311, 312 + 216, 217, 218, 219, 221, 222, 223, 224, 225, 226, + 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, + 237, 238, 240, 241, 242, 243, 244, 246, 247, 248, + 249, 250, 252, 253, 254, 256, 258, 259, 260, 261, + + 262, 263, 264, 266, 268, 269, 270, 271, 272, 273, + 274, 276, 277, 278, 280, 281, 282, 284, 285, 286, + 287, 288, 289, 290, 291, 292, 293, 294, 296, 297, + 298, 299, 300, 301, 302, 303, 304, 305, 306, 308, + 309, 310, 312, 313, 314, 315 } ; /* The intent behind this definition is that it'll catch @@ -1402,7 +1406,7 @@ #define YY_RESTORE_YY_MORE_OFFSET #line 1 "../s/bif.l" /****************************************************************************** -* Copyright 2015-2020 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1429,7 +1433,7 @@ /* see http://www.lysator.liu.se/c/ANSI-C-grammar-l.html */ #line 35 "../s/bif.l" # define YY_USER_ACTION yylloc->columns (yyleng); -#line 1433 "../bisonflex/bif.yy.cpp" +#line 1437 "../bisonflex/bif.yy.cpp" #define INITIAL 0 @@ -1593,7 +1597,7 @@ yylloc->step (); -#line 1597 "../bisonflex/bif.yy.cpp" +#line 1601 "../bisonflex/bif.yy.cpp" if ( !(yy_init) ) { @@ -1656,13 +1660,13 @@ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1103 ) + if ( yy_current_state >= 1111 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_current_state != 1102 ); + while ( yy_current_state != 1110 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -1681,12 +1685,12 @@ { if ( yy_act == 0 ) std::cerr << "--scanner backing up\n"; - else if ( yy_act < 244 ) + else if ( yy_act < 247 ) std::cerr << "--accepting rule at line " << yy_rule_linenum[yy_act] << "(\"" << yytext << "\")\n"; - else if ( yy_act == 244 ) + else if ( yy_act == 247 ) std::cerr << "--accepting default rule (\"" << yytext << "\")\n"; - else if ( yy_act == 245 ) + else if ( yy_act == 248 ) std::cerr << "--(end of buffer or a NUL)\n"; else std::cerr << "--EOF (start condition " << YY_START << ")\n"; @@ -2120,811 +2124,826 @@ YY_BREAK case 84: YY_RULE_SETUP -#line 136 "../s/bif.l" -return tok::PARTITION_TYPE; +#line 135 "../s/bif.l" +yylval->number = PartitionOwner::FSBL; return tok::POWNERVALUE ; YY_BREAK case 85: YY_RULE_SETUP -#line 137 "../s/bif.l" -return tok::PARTITION_TYPE; +#line 136 "../s/bif.l" +yylval->number = PartitionOwner::UBOOT; return tok::POWNERVALUE ; YY_BREAK case 86: YY_RULE_SETUP #line 138 "../s/bif.l" -yylval->number = PartitionType::CONFIG_DATA_OBJ;return tok::PTYPEVALUE; +return tok::PARTITION_TYPE; YY_BREAK case 87: YY_RULE_SETUP #line 139 "../s/bif.l" -yylval->number = PartitionType::RAW; return tok::PTYPEVALUE; +return tok::PARTITION_TYPE; YY_BREAK case 88: YY_RULE_SETUP #line 140 "../s/bif.l" -yylval->number = PartitionType::CFI; return tok::PTYPEVALUE; +yylval->number = PartitionType::CONFIG_DATA_OBJ;return tok::PTYPEVALUE; YY_BREAK case 89: YY_RULE_SETUP #line 141 "../s/bif.l" -yylval->number = PartitionType::CFI_GSC; return tok::PTYPEVALUE; +yylval->number = PartitionType::RAW; return tok::PTYPEVALUE; YY_BREAK case 90: YY_RULE_SETUP #line 142 "../s/bif.l" -yylval->number = PartitionType::SLR_BOOT; return tok::PTYPEVALUE; +yylval->number = PartitionType::CFI; return tok::PTYPEVALUE; YY_BREAK case 91: YY_RULE_SETUP #line 143 "../s/bif.l" -yylval->number = PartitionType::SLR_CONFIG; return tok::PTYPEVALUE; +yylval->number = PartitionType::CFI_GSC; return tok::PTYPEVALUE; YY_BREAK case 92: YY_RULE_SETUP -#line 145 "../s/bif.l" -yylval->number = tok::KEYSRC_ENCRYPTION; return tok::KEYSRC_ENCRYPTION; +#line 144 "../s/bif.l" +yylval->number = PartitionType::SLR_BOOT; return tok::PTYPEVALUE; YY_BREAK case 93: YY_RULE_SETUP -#line 146 "../s/bif.l" -yylval->number = tok::KEYSRC_ENCRYPTION; return tok::KEYSRC_ENCRYPTION; +#line 145 "../s/bif.l" +yylval->number = PartitionType::SLR_CONFIG; return tok::PTYPEVALUE; YY_BREAK case 94: YY_RULE_SETUP -#line 147 "../s/bif.l" -yylval->number = KeySource::EfuseRedKey; return tok::KEY_SRC; +#line 146 "../s/bif.l" +yylval->number = PartitionType::SLR_SLAVE; return tok::PTYPEVALUE; YY_BREAK case 95: YY_RULE_SETUP #line 148 "../s/bif.l" -yylval->number = KeySource::BbramRedKey; return tok::KEY_SRC; +yylval->number = tok::KEYSRC_ENCRYPTION; return tok::KEYSRC_ENCRYPTION; YY_BREAK case 96: YY_RULE_SETUP #line 149 "../s/bif.l" -yylval->number = KeySource::EfuseRedKey; return tok::KEY_SRC; +yylval->number = tok::KEYSRC_ENCRYPTION; return tok::KEYSRC_ENCRYPTION; YY_BREAK case 97: YY_RULE_SETUP #line 150 "../s/bif.l" -yylval->number = KeySource::EfuseBlkKey; return tok::KEY_SRC; +yylval->number = KeySource::EfuseRedKey; return tok::KEY_SRC; YY_BREAK case 98: YY_RULE_SETUP #line 151 "../s/bif.l" -yylval->number = KeySource::EfuseGryKey; return tok::KEY_SRC; +yylval->number = KeySource::BbramRedKey; return tok::KEY_SRC; YY_BREAK case 99: YY_RULE_SETUP #line 152 "../s/bif.l" -yylval->number = KeySource::BbramRedKey; return tok::KEY_SRC; +yylval->number = KeySource::EfuseRedKey; return tok::KEY_SRC; YY_BREAK case 100: YY_RULE_SETUP #line 153 "../s/bif.l" -yylval->number = KeySource::BbramBlkKey; return tok::KEY_SRC; +yylval->number = KeySource::EfuseBlkKey; return tok::KEY_SRC; YY_BREAK case 101: YY_RULE_SETUP #line 154 "../s/bif.l" -yylval->number = KeySource::BbramGryKey; return tok::KEY_SRC; +yylval->number = KeySource::EfuseGryKey; return tok::KEY_SRC; YY_BREAK case 102: YY_RULE_SETUP #line 155 "../s/bif.l" -yylval->number = KeySource::BhGryKey; return tok::KEY_SRC; +yylval->number = KeySource::BbramRedKey; return tok::KEY_SRC; YY_BREAK case 103: YY_RULE_SETUP #line 156 "../s/bif.l" -yylval->number = KeySource::BhBlkKey; return tok::KEY_SRC; +yylval->number = KeySource::BbramBlkKey; return tok::KEY_SRC; YY_BREAK case 104: YY_RULE_SETUP #line 157 "../s/bif.l" -yylval->number = KeySource::UserKey0; return tok::KEY_SRC; +yylval->number = KeySource::BbramGryKey; return tok::KEY_SRC; YY_BREAK case 105: YY_RULE_SETUP #line 158 "../s/bif.l" -yylval->number = KeySource::UserKey1; return tok::KEY_SRC; +yylval->number = KeySource::BhGryKey; return tok::KEY_SRC; YY_BREAK case 106: YY_RULE_SETUP #line 159 "../s/bif.l" -yylval->number = KeySource::UserKey2; return tok::KEY_SRC; +yylval->number = KeySource::BhBlkKey; return tok::KEY_SRC; YY_BREAK case 107: YY_RULE_SETUP #line 160 "../s/bif.l" -yylval->number = KeySource::UserKey3; return tok::KEY_SRC; +yylval->number = KeySource::UserKey0; return tok::KEY_SRC; YY_BREAK case 108: YY_RULE_SETUP #line 161 "../s/bif.l" -yylval->number = KeySource::UserKey4; return tok::KEY_SRC; +yylval->number = KeySource::UserKey1; return tok::KEY_SRC; YY_BREAK case 109: YY_RULE_SETUP #line 162 "../s/bif.l" -yylval->number = KeySource::UserKey5; return tok::KEY_SRC; +yylval->number = KeySource::UserKey2; return tok::KEY_SRC; YY_BREAK case 110: YY_RULE_SETUP #line 163 "../s/bif.l" -yylval->number = KeySource::UserKey6; return tok::KEY_SRC; +yylval->number = KeySource::UserKey3; return tok::KEY_SRC; YY_BREAK case 111: YY_RULE_SETUP #line 164 "../s/bif.l" -yylval->number = KeySource::UserKey7; return tok::KEY_SRC; +yylval->number = KeySource::UserKey4; return tok::KEY_SRC; YY_BREAK case 112: YY_RULE_SETUP #line 165 "../s/bif.l" -yylval->number = KeySource::EfuseUserKey0; return tok::KEY_SRC; +yylval->number = KeySource::UserKey5; return tok::KEY_SRC; YY_BREAK case 113: YY_RULE_SETUP #line 166 "../s/bif.l" -yylval->number = KeySource::EfuseUserBlkKey0; return tok::KEY_SRC; +yylval->number = KeySource::UserKey6; return tok::KEY_SRC; YY_BREAK case 114: YY_RULE_SETUP #line 167 "../s/bif.l" -yylval->number = KeySource::EfuseUserGryKey0; return tok::KEY_SRC; +yylval->number = KeySource::UserKey7; return tok::KEY_SRC; YY_BREAK case 115: YY_RULE_SETUP #line 168 "../s/bif.l" -yylval->number = KeySource::EfuseUserKey1; return tok::KEY_SRC; +yylval->number = KeySource::EfuseUserKey0; return tok::KEY_SRC; YY_BREAK case 116: YY_RULE_SETUP #line 169 "../s/bif.l" -yylval->number = KeySource::EfuseUserBlkKey1; return tok::KEY_SRC; +yylval->number = KeySource::EfuseUserBlkKey0; return tok::KEY_SRC; YY_BREAK case 117: YY_RULE_SETUP #line 170 "../s/bif.l" -yylval->number = KeySource::EfuseUserGryKey1; return tok::KEY_SRC; +yylval->number = KeySource::EfuseUserGryKey0; return tok::KEY_SRC; YY_BREAK case 118: YY_RULE_SETUP #line 171 "../s/bif.l" -yylval->number = KeySource::BhKupKey; return tok::KEY_SRC; +yylval->number = KeySource::EfuseUserKey1; return tok::KEY_SRC; YY_BREAK case 119: YY_RULE_SETUP -#line 173 "../s/bif.l" -yylval->number = tok::FSBL_CONFIG; return tok::FSBL_CONFIG; +#line 172 "../s/bif.l" +yylval->number = KeySource::EfuseUserBlkKey1; return tok::KEY_SRC; YY_BREAK case 120: YY_RULE_SETUP -#line 174 "../s/bif.l" -yylval->number = tok::FSBL_CONFIG; return tok::FSBL_CONFIG; +#line 173 "../s/bif.l" +yylval->number = KeySource::EfuseUserGryKey1; return tok::KEY_SRC; YY_BREAK case 121: YY_RULE_SETUP -#line 175 "../s/bif.l" -yylval->number = tok::FSBL_CONFIG; return tok::FSBL_CONFIG; +#line 174 "../s/bif.l" +yylval->number = KeySource::BhKupKey; return tok::KEY_SRC; YY_BREAK case 122: YY_RULE_SETUP #line 176 "../s/bif.l" -yylval->number = Core::R5Single; return tok::CORE; +yylval->number = tok::FSBL_CONFIG; return tok::FSBL_CONFIG; YY_BREAK case 123: YY_RULE_SETUP #line 177 "../s/bif.l" -yylval->number = Core::A53Singlex32; return tok::CORE; +yylval->number = tok::FSBL_CONFIG; return tok::FSBL_CONFIG; YY_BREAK case 124: YY_RULE_SETUP #line 178 "../s/bif.l" -yylval->number = Core::A53Singlex32; return tok::CORE; +yylval->number = tok::FSBL_CONFIG; return tok::FSBL_CONFIG; YY_BREAK case 125: YY_RULE_SETUP #line 179 "../s/bif.l" -yylval->number = Core::A53Singlex64; return tok::CORE; +yylval->number = Core::R5Single; return tok::CORE; YY_BREAK case 126: YY_RULE_SETUP #line 180 "../s/bif.l" -yylval->number = Core::A53Singlex64; return tok::CORE; +yylval->number = Core::A53Singlex32; return tok::CORE; YY_BREAK case 127: YY_RULE_SETUP #line 181 "../s/bif.l" -yylval->number = Core::R5Dual; return tok::CORE; +yylval->number = Core::A53Singlex32; return tok::CORE; YY_BREAK case 128: YY_RULE_SETUP #line 182 "../s/bif.l" -yylval->number = BhRsa::BhRsaEnable; return tok::BH_RSA; +yylval->number = Core::A53Singlex64; return tok::CORE; YY_BREAK case 129: YY_RULE_SETUP #line 183 "../s/bif.l" -yylval->number = AuthHash::Sha2; return tok::AUTH_HASH; +yylval->number = Core::A53Singlex64; return tok::CORE; YY_BREAK case 130: YY_RULE_SETUP #line 184 "../s/bif.l" -yylval->number = PufHdLoc::PUFinBH; return tok::PUFHD_LOC; +yylval->number = Core::R5Dual; return tok::CORE; YY_BREAK case 131: YY_RULE_SETUP #line 185 "../s/bif.l" -yylval->number = AuthOnly::Enabled; return tok::AUTH_ONLY; +yylval->number = BhRsa::BhRsaEnable; return tok::BH_RSA; YY_BREAK case 132: YY_RULE_SETUP #line 186 "../s/bif.l" -yylval->number = OptKey::OptKeyinSecHdr; return tok::OPT_KEY; +yylval->number = AuthHash::Sha2; return tok::AUTH_HASH; YY_BREAK case 133: YY_RULE_SETUP #line 187 "../s/bif.l" -yylval->number = PufMode::PUF4K; return tok::PUF4KMODE; +yylval->number = PufHdLoc::PUFinBH; return tok::PUFHD_LOC; YY_BREAK case 134: YY_RULE_SETUP #line 188 "../s/bif.l" -yylval->number = tok::SHUTTER; return tok::SHUTTER; +yylval->number = AuthOnly::Enabled; return tok::AUTH_ONLY; YY_BREAK case 135: YY_RULE_SETUP #line 189 "../s/bif.l" -yylval->number = DpaCM::DpaCMEnable; return tok::DPA_CM; +yylval->number = OptKey::OptKeyinSecHdr; return tok::OPT_KEY; YY_BREAK case 136: YY_RULE_SETUP #line 190 "../s/bif.l" -yylval->number = tok::SMAP_WIDTH; return tok::SMAP_WIDTH; +yylval->number = PufMode::PUF4K; return tok::PUF4KMODE; YY_BREAK case 137: YY_RULE_SETUP #line 191 "../s/bif.l" -yylval->number = tok::BYPASS_IDCODE_CHECK; return tok::BYPASS_IDCODE_CHECK; +yylval->number = tok::SHUTTER; return tok::SHUTTER; YY_BREAK case 138: YY_RULE_SETUP #line 192 "../s/bif.l" -yylval->number = tok::A_HWROT; return tok::A_HWROT; +yylval->number = DpaCM::DpaCMEnable; return tok::DPA_CM; YY_BREAK case 139: YY_RULE_SETUP #line 193 "../s/bif.l" -yylval->number = tok::S_HWROT; return tok::S_HWROT; +yylval->number = tok::SMAP_WIDTH; return tok::SMAP_WIDTH; YY_BREAK case 140: YY_RULE_SETUP -#line 195 "../s/bif.l" -return tok::BOOT_DEVICE; +#line 194 "../s/bif.l" +yylval->number = tok::BYPASS_IDCODE_CHECK; return tok::BYPASS_IDCODE_CHECK; YY_BREAK case 141: YY_RULE_SETUP -#line 196 "../s/bif.l" -yylval->number = tok::ADDRESS; return tok::ADDRESS; +#line 195 "../s/bif.l" +yylval->number = tok::A_HWROT; return tok::A_HWROT; YY_BREAK case 142: YY_RULE_SETUP -#line 197 "../s/bif.l" -yylval->number = BootDevice::QSPI32; return tok::BOOT_DEVICE_TYPE ; +#line 196 "../s/bif.l" +yylval->number = tok::S_HWROT; return tok::S_HWROT; YY_BREAK case 143: YY_RULE_SETUP #line 198 "../s/bif.l" -yylval->number = BootDevice::QSPI24; return tok::BOOT_DEVICE_TYPE ; +return tok::BOOT_DEVICE; YY_BREAK case 144: YY_RULE_SETUP #line 199 "../s/bif.l" -yylval->number = BootDevice::NAND; return tok::BOOT_DEVICE_TYPE ; +yylval->number = tok::ADDRESS; return tok::ADDRESS; YY_BREAK case 145: YY_RULE_SETUP #line 200 "../s/bif.l" -yylval->number = BootDevice::SD0; return tok::BOOT_DEVICE_TYPE ; +yylval->number = BootDevice::QSPI32; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 146: YY_RULE_SETUP #line 201 "../s/bif.l" -yylval->number = BootDevice::SD1; return tok::BOOT_DEVICE_TYPE ; +yylval->number = BootDevice::QSPI24; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 147: YY_RULE_SETUP #line 202 "../s/bif.l" -yylval->number = BootDevice::SDLS; return tok::BOOT_DEVICE_TYPE ; +yylval->number = BootDevice::NAND; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 148: YY_RULE_SETUP #line 203 "../s/bif.l" -yylval->number = BootDevice::MMC; return tok::BOOT_DEVICE_TYPE ; +yylval->number = BootDevice::SD0; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 149: YY_RULE_SETUP #line 204 "../s/bif.l" -yylval->number = BootDevice::USB; return tok::BOOT_DEVICE_TYPE ; +yylval->number = BootDevice::SD1; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 150: YY_RULE_SETUP #line 205 "../s/bif.l" -yylval->number = BootDevice::ETHERNET; return tok::BOOT_DEVICE_TYPE ; +yylval->number = BootDevice::SDLS; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 151: YY_RULE_SETUP #line 206 "../s/bif.l" -yylval->number = BootDevice::PCIE; return tok::BOOT_DEVICE_TYPE ; +yylval->number = BootDevice::MMC; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 152: YY_RULE_SETUP #line 207 "../s/bif.l" -yylval->number = BootDevice::SATA; return tok::BOOT_DEVICE_TYPE ; +yylval->number = BootDevice::USB; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 153: YY_RULE_SETUP #line 208 "../s/bif.l" -yylval->number = BootDevice::OSPI; return tok::BOOT_DEVICE_TYPE ; +yylval->number = BootDevice::ETHERNET; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 154: YY_RULE_SETUP #line 209 "../s/bif.l" -yylval->number = BootDevice::SMAP; return tok::BOOT_DEVICE_TYPE ; +yylval->number = BootDevice::PCIE; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 155: YY_RULE_SETUP #line 210 "../s/bif.l" -yylval->number = BootDevice::SBI; return tok::BOOT_DEVICE_TYPE ; +yylval->number = BootDevice::SATA; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 156: YY_RULE_SETUP #line 211 "../s/bif.l" -yylval->number = BootDevice::SD0RAW; return tok::BOOT_DEVICE_TYPE ; +yylval->number = BootDevice::OSPI; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 157: YY_RULE_SETUP #line 212 "../s/bif.l" -yylval->number = BootDevice::SD1RAW; return tok::BOOT_DEVICE_TYPE ; +yylval->number = BootDevice::SMAP; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 158: YY_RULE_SETUP #line 213 "../s/bif.l" -yylval->number = BootDevice::SDLSRAW; return tok::BOOT_DEVICE_TYPE ; +yylval->number = BootDevice::SBI; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 159: YY_RULE_SETUP #line 214 "../s/bif.l" -yylval->number = BootDevice::MMCRAW; return tok::BOOT_DEVICE_TYPE ; +yylval->number = BootDevice::SD0RAW; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 160: YY_RULE_SETUP #line 215 "../s/bif.l" -yylval->number = BootDevice::MMC0; return tok::BOOT_DEVICE_TYPE ; +yylval->number = BootDevice::SD1RAW; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 161: YY_RULE_SETUP #line 216 "../s/bif.l" -yylval->number = BootDevice::MMC0RAW; return tok::BOOT_DEVICE_TYPE ; +yylval->number = BootDevice::SDLSRAW; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 162: YY_RULE_SETUP -#line 218 "../s/bif.l" -return tok::DEST_CPU; +#line 217 "../s/bif.l" +yylval->number = BootDevice::MMCRAW; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 163: YY_RULE_SETUP -#line 219 "../s/bif.l" -return tok::DEST_CPU; +#line 218 "../s/bif.l" +yylval->number = BootDevice::MMC0; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 164: YY_RULE_SETUP -#line 220 "../s/bif.l" -yylval->number = DestinationCPU::A53_0; return tok::DEST_CPU_TYPE; +#line 219 "../s/bif.l" +yylval->number = BootDevice::MMC0RAW; return tok::BOOT_DEVICE_TYPE ; YY_BREAK case 165: YY_RULE_SETUP #line 221 "../s/bif.l" -yylval->number = DestinationCPU::A53_0; return tok::DEST_CPU_TYPE; +return tok::DEST_CPU; YY_BREAK case 166: YY_RULE_SETUP #line 222 "../s/bif.l" -yylval->number = DestinationCPU::A53_0; return tok::DEST_CPU_TYPE; +return tok::DEST_CPU; YY_BREAK case 167: YY_RULE_SETUP #line 223 "../s/bif.l" -yylval->number = DestinationCPU::A53_1; return tok::DEST_CPU_TYPE; +yylval->number = DestinationCPU::A53_0; return tok::DEST_CPU_TYPE; YY_BREAK case 168: YY_RULE_SETUP #line 224 "../s/bif.l" -yylval->number = DestinationCPU::A53_1; return tok::DEST_CPU_TYPE; +yylval->number = DestinationCPU::A53_0; return tok::DEST_CPU_TYPE; YY_BREAK case 169: YY_RULE_SETUP #line 225 "../s/bif.l" -yylval->number = DestinationCPU::A53_1; return tok::DEST_CPU_TYPE; +yylval->number = DestinationCPU::A53_0; return tok::DEST_CPU_TYPE; YY_BREAK case 170: YY_RULE_SETUP #line 226 "../s/bif.l" -yylval->number = DestinationCPU::A53_2; return tok::DEST_CPU_TYPE; +yylval->number = DestinationCPU::A53_1; return tok::DEST_CPU_TYPE; YY_BREAK case 171: YY_RULE_SETUP #line 227 "../s/bif.l" -yylval->number = DestinationCPU::A53_2; return tok::DEST_CPU_TYPE; +yylval->number = DestinationCPU::A53_1; return tok::DEST_CPU_TYPE; YY_BREAK case 172: YY_RULE_SETUP #line 228 "../s/bif.l" -yylval->number = DestinationCPU::A53_3; return tok::DEST_CPU_TYPE; +yylval->number = DestinationCPU::A53_1; return tok::DEST_CPU_TYPE; YY_BREAK case 173: YY_RULE_SETUP #line 229 "../s/bif.l" -yylval->number = DestinationCPU::A53_3; return tok::DEST_CPU_TYPE; +yylval->number = DestinationCPU::A53_2; return tok::DEST_CPU_TYPE; YY_BREAK case 174: YY_RULE_SETUP #line 230 "../s/bif.l" -yylval->number = DestinationCPU::R5_0; return tok::DEST_CPU_TYPE; +yylval->number = DestinationCPU::A53_2; return tok::DEST_CPU_TYPE; YY_BREAK case 175: YY_RULE_SETUP #line 231 "../s/bif.l" -yylval->number = DestinationCPU::R5_1; return tok::DEST_CPU_TYPE; +yylval->number = DestinationCPU::A53_3; return tok::DEST_CPU_TYPE; YY_BREAK case 176: YY_RULE_SETUP #line 232 "../s/bif.l" -yylval->number = DestinationCPU::R5_lockstep; return tok::DEST_CPU_TYPE; +yylval->number = DestinationCPU::A53_3; return tok::DEST_CPU_TYPE; YY_BREAK case 177: YY_RULE_SETUP #line 233 "../s/bif.l" -yylval->number = DestinationCPU::PMU; return tok::DEST_CPU_TYPE; +yylval->number = DestinationCPU::R5_0; return tok::DEST_CPU_TYPE; YY_BREAK case 178: YY_RULE_SETUP #line 234 "../s/bif.l" -yylval->number = DestinationCPU::PMU; return tok::DEST_CPU_TYPE; +yylval->number = DestinationCPU::R5_1; return tok::DEST_CPU_TYPE; YY_BREAK case 179: YY_RULE_SETUP #line 235 "../s/bif.l" -yylval->number = DestinationCPU::AIE; return tok::DEST_CPU_TYPE; +yylval->number = DestinationCPU::R5_lockstep; return tok::DEST_CPU_TYPE; YY_BREAK case 180: YY_RULE_SETUP -#line 237 "../s/bif.l" -return tok::DEST_DEVICE; +#line 236 "../s/bif.l" +yylval->number = DestinationCPU::PMU; return tok::DEST_CPU_TYPE; YY_BREAK case 181: YY_RULE_SETUP -#line 238 "../s/bif.l" -yylval->number = DestinationDevice::DEST_DEV_PS; return tok::DEST_DEVICE_TYPE; +#line 237 "../s/bif.l" +yylval->number = DestinationCPU::PMU; return tok::DEST_CPU_TYPE; YY_BREAK case 182: YY_RULE_SETUP -#line 239 "../s/bif.l" -yylval->number = DestinationDevice::DEST_DEV_PL; return tok::DEST_DEVICE_TYPE; +#line 238 "../s/bif.l" +yylval->number = DestinationCPU::AIE; return tok::DEST_CPU_TYPE; YY_BREAK case 183: YY_RULE_SETUP #line 240 "../s/bif.l" -yylval->number = DestinationDevice::DEST_DEV_PMU; return tok::DEST_DEVICE_TYPE; +return tok::DEST_DEVICE; YY_BREAK case 184: YY_RULE_SETUP #line 241 "../s/bif.l" -yylval->number = DestinationDevice::DEST_DEV_XIP; return tok::DEST_DEVICE_TYPE; +yylval->number = DestinationDevice::DEST_DEV_PS; return tok::DEST_DEVICE_TYPE; YY_BREAK case 185: YY_RULE_SETUP -#line 243 "../s/bif.l" -return tok::EXCEPTION_LEVEL; +#line 242 "../s/bif.l" +yylval->number = DestinationDevice::DEST_DEV_PL; return tok::DEST_DEVICE_TYPE; YY_BREAK case 186: YY_RULE_SETUP -#line 244 "../s/bif.l" -yylval->number = ExceptionLevel::EL0; return tok::EXCEPTION_LEVEL_TYPE; +#line 243 "../s/bif.l" +yylval->number = DestinationDevice::DEST_DEV_PMU; return tok::DEST_DEVICE_TYPE; YY_BREAK case 187: YY_RULE_SETUP -#line 245 "../s/bif.l" -yylval->number = ExceptionLevel::EL1; return tok::EXCEPTION_LEVEL_TYPE; +#line 244 "../s/bif.l" +yylval->number = DestinationDevice::DEST_DEV_XIP; return tok::DEST_DEVICE_TYPE; YY_BREAK case 188: YY_RULE_SETUP #line 246 "../s/bif.l" -yylval->number = ExceptionLevel::EL2; return tok::EXCEPTION_LEVEL_TYPE; +return tok::EXCEPTION_LEVEL; YY_BREAK case 189: YY_RULE_SETUP #line 247 "../s/bif.l" -yylval->number = ExceptionLevel::EL3; return tok::EXCEPTION_LEVEL_TYPE; +yylval->number = ExceptionLevel::EL0; return tok::EXCEPTION_LEVEL_TYPE; YY_BREAK case 190: YY_RULE_SETUP -#line 249 "../s/bif.l" -return tok::TRUSTZONE; +#line 248 "../s/bif.l" +yylval->number = ExceptionLevel::EL1; return tok::EXCEPTION_LEVEL_TYPE; YY_BREAK case 191: YY_RULE_SETUP -#line 250 "../s/bif.l" -yylval->number = TrustZone::Secure; return tok::TRUSTZONE_TYPE; +#line 249 "../s/bif.l" +yylval->number = ExceptionLevel::EL2; return tok::EXCEPTION_LEVEL_TYPE; YY_BREAK case 192: YY_RULE_SETUP -#line 251 "../s/bif.l" -yylval->number = TrustZone::NonSecure; return tok::TRUSTZONE_TYPE; +#line 250 "../s/bif.l" +yylval->number = ExceptionLevel::EL3; return tok::EXCEPTION_LEVEL_TYPE; YY_BREAK case 193: YY_RULE_SETUP -#line 253 "../s/bif.l" -yylval->number = tok::SLR_NUM; return tok::SLR_NUM; +#line 252 "../s/bif.l" +return tok::TRUSTZONE; YY_BREAK case 194: YY_RULE_SETUP -#line 255 "../s/bif.l" -yylval->number = tok::AUTH_PARAMS; return tok::AUTH_PARAMS; +#line 253 "../s/bif.l" +yylval->number = TrustZone::Secure; return tok::TRUSTZONE_TYPE; YY_BREAK case 195: YY_RULE_SETUP -#line 256 "../s/bif.l" -yylval->number = tok::PPK_SELECT; return tok::PPK_SELECT; +#line 254 "../s/bif.l" +yylval->number = TrustZone::NonSecure; return tok::TRUSTZONE_TYPE; YY_BREAK case 196: YY_RULE_SETUP -#line 257 "../s/bif.l" -yylval->number = tok::SPK_SELECT; return tok::SPK_SELECT; +#line 256 "../s/bif.l" +yylval->number = tok::SLR_NUM; return tok::SLR_NUM; YY_BREAK case 197: YY_RULE_SETUP #line 258 "../s/bif.l" -yylval->number = SpkSelect::SPK_eFUSE; return tok::SPKSELECT; +yylval->number = tok::AUTH_PARAMS; return tok::AUTH_PARAMS; YY_BREAK case 198: YY_RULE_SETUP #line 259 "../s/bif.l" -yylval->number = SpkSelect::USER_eFUSE; return tok::SPKSELECT; +yylval->number = tok::PPK_SELECT; return tok::PPK_SELECT; YY_BREAK case 199: YY_RULE_SETUP #line 260 "../s/bif.l" -yylval->number = tok::SPK_ID; return tok::SPK_ID; +yylval->number = tok::SPK_SELECT; return tok::SPK_SELECT; YY_BREAK case 200: YY_RULE_SETUP #line 261 "../s/bif.l" -return tok::HEADER_AUTH; +yylval->number = SpkSelect::SPK_eFUSE; return tok::SPKSELECT; YY_BREAK case 201: YY_RULE_SETUP -#line 263 "../s/bif.l" -yylval->number = tok::REVOKE_ID; return tok::REVOKE_ID; +#line 262 "../s/bif.l" +yylval->number = SpkSelect::USER_eFUSE; return tok::SPKSELECT; YY_BREAK case 202: YY_RULE_SETUP -#line 265 "../s/bif.l" -yylval->number = tok::SPLIT; return tok::SPLIT; +#line 263 "../s/bif.l" +yylval->number = tok::SPK_ID; return tok::SPK_ID; YY_BREAK case 203: YY_RULE_SETUP -#line 266 "../s/bif.l" -yylval->number = tok::SPLIT_MODE; return tok::SPLIT_MODE; +#line 264 "../s/bif.l" +return tok::HEADER_AUTH; YY_BREAK case 204: YY_RULE_SETUP -#line 267 "../s/bif.l" -yylval->number = SplitMode::SlaveMode; return tok::SPLITMODE; +#line 266 "../s/bif.l" +yylval->number = tok::REVOKE_ID; return tok::REVOKE_ID; YY_BREAK case 205: YY_RULE_SETUP #line 268 "../s/bif.l" -yylval->number = SplitMode::Normal; return tok::SPLITMODE; +yylval->number = tok::SPLIT; return tok::SPLIT; YY_BREAK case 206: YY_RULE_SETUP #line 269 "../s/bif.l" -yylval->number = tok::SPLIT_FMT; return tok::SPLIT_FMT; +yylval->number = tok::SPLIT_MODE; return tok::SPLIT_MODE; YY_BREAK case 207: YY_RULE_SETUP #line 270 "../s/bif.l" -return tok::MCS; +yylval->number = SplitMode::SlaveMode; return tok::SPLITMODE; YY_BREAK case 208: YY_RULE_SETUP #line 271 "../s/bif.l" -return tok::BIN; +yylval->number = SplitMode::Normal; return tok::SPLITMODE; YY_BREAK case 209: YY_RULE_SETUP -#line 273 "../s/bif.l" -yylval->number = tok::AUTHJTAG_CONFIG; return tok::AUTHJTAG_CONFIG; +#line 272 "../s/bif.l" +yylval->number = tok::SPLIT_FMT; return tok::SPLIT_FMT; YY_BREAK case 210: YY_RULE_SETUP -#line 274 "../s/bif.l" -yylval->number = tok::DEVICE_DNA; return tok::DEVICE_DNA; +#line 273 "../s/bif.l" +return tok::MCS; YY_BREAK case 211: YY_RULE_SETUP -#line 275 "../s/bif.l" -yylval->number = tok::JTAG_TIMEOUT; return tok::JTAG_TIMEOUT; +#line 274 "../s/bif.l" +return tok::BIN; YY_BREAK case 212: YY_RULE_SETUP -#line 277 "../s/bif.l" -yylval->number=atoi(yytext); return tok::DECVALUE; +#line 276 "../s/bif.l" +yylval->number = tok::AUTHJTAG_CONFIG; return tok::AUTHJTAG_CONFIG; YY_BREAK case 213: YY_RULE_SETUP -#line 278 "../s/bif.l" -yylval->number=strtoul(yytext+2,NULL,16); return tok::HEXVALUE; +#line 277 "../s/bif.l" +yylval->number = tok::DEVICE_DNA; return tok::DEVICE_DNA; YY_BREAK case 214: YY_RULE_SETUP -#line 279 "../s/bif.l" -yylval->string=strdup(yytext); return tok::HEXWORD; +#line 278 "../s/bif.l" +yylval->number = tok::JTAG_TIMEOUT; return tok::JTAG_TIMEOUT; YY_BREAK case 215: YY_RULE_SETUP -#line 281 "../s/bif.l" -return tok::COLON; +#line 280 "../s/bif.l" +yylval->number=atoi(yytext); return tok::DECVALUE; YY_BREAK case 216: YY_RULE_SETUP -#line 282 "../s/bif.l" -return tok::SEMICOLON; +#line 281 "../s/bif.l" +yylval->number=strtoul(yytext+2,NULL,16); return tok::HEXVALUE; YY_BREAK case 217: YY_RULE_SETUP -#line 283 "../s/bif.l" -return tok::EQUAL; +#line 282 "../s/bif.l" +yylval->string=strdup(yytext); return tok::HEXWORD; YY_BREAK case 218: YY_RULE_SETUP #line 284 "../s/bif.l" -return tok::COMMA; +return tok::COLON; YY_BREAK case 219: YY_RULE_SETUP #line 285 "../s/bif.l" -return tok::OBRACKET; +return tok::SEMICOLON; YY_BREAK case 220: YY_RULE_SETUP #line 286 "../s/bif.l" -return tok::EBRACKET; +return tok::EQUAL; YY_BREAK case 221: YY_RULE_SETUP #line 287 "../s/bif.l" -return tok::OBRACE; +return tok::COMMA; YY_BREAK case 222: YY_RULE_SETUP #line 288 "../s/bif.l" -return tok::EBRACE; +return tok::OBRACKET; YY_BREAK case 223: YY_RULE_SETUP #line 289 "../s/bif.l" -return tok::LPAREN; +return tok::EBRACKET; YY_BREAK case 224: YY_RULE_SETUP #line 290 "../s/bif.l" -return tok::RPAREN; +return tok::OBRACE; YY_BREAK case 225: YY_RULE_SETUP #line 291 "../s/bif.l" -return tok::ASTERISK; +return tok::EBRACE; YY_BREAK case 226: YY_RULE_SETUP -#line 293 "../s/bif.l" -return tok::PLUS; +#line 292 "../s/bif.l" +return tok::LPAREN; YY_BREAK case 227: YY_RULE_SETUP -#line 294 "../s/bif.l" -return tok::MINUS; +#line 293 "../s/bif.l" +return tok::RPAREN; YY_BREAK case 228: YY_RULE_SETUP -#line 295 "../s/bif.l" -return tok::LSHIFT; +#line 294 "../s/bif.l" +return tok::ASTERISK; YY_BREAK case 229: YY_RULE_SETUP #line 296 "../s/bif.l" -return tok::RSHIFT; +return tok::PLUS; YY_BREAK case 230: YY_RULE_SETUP #line 297 "../s/bif.l" -return tok::MULT; +return tok::MINUS; YY_BREAK case 231: YY_RULE_SETUP #line 298 "../s/bif.l" -return tok::DIVIDE; +return tok::LSHIFT; YY_BREAK case 232: YY_RULE_SETUP #line 299 "../s/bif.l" -return tok::MODULO; +return tok::RSHIFT; YY_BREAK case 233: YY_RULE_SETUP #line 300 "../s/bif.l" -return tok::NEGATION; +return tok::MULT; YY_BREAK case 234: YY_RULE_SETUP #line 301 "../s/bif.l" -return tok::AND; +return tok::DIVIDE; YY_BREAK case 235: YY_RULE_SETUP #line 302 "../s/bif.l" -return tok::OR; +return tok::MODULO; YY_BREAK case 236: YY_RULE_SETUP #line 303 "../s/bif.l" -return tok::XOR; +return tok::NEGATION; YY_BREAK case 237: YY_RULE_SETUP -#line 305 "../s/bif.l" -yylval->string=strdup(yytext); return tok::WORD; +#line 304 "../s/bif.l" +return tok::AND; YY_BREAK case 238: YY_RULE_SETUP -#line 306 "../s/bif.l" -yylval->string=strdup(yytext); return tok::FILENAME; +#line 305 "../s/bif.l" +return tok::OR; YY_BREAK case 239: YY_RULE_SETUP -#line 307 "../s/bif.l" -yylval->string=strdup(yytext+1); yylval->string[strlen(yytext)-2]=0; return tok::QFILENAME; +#line 306 "../s/bif.l" +return tok::XOR; YY_BREAK case 240: YY_RULE_SETUP -#line 309 "../s/bif.l" -yylloc->step (); +#line 308 "../s/bif.l" +yylval->string=strdup(yytext); return tok::WORD; YY_BREAK case 241: -/* rule 241 can match eol */ YY_RULE_SETUP -#line 310 "../s/bif.l" -yylloc->lines (yyleng); yylloc->step (); +#line 309 "../s/bif.l" +yylval->string=strdup(yytext); return tok::FILENAME; YY_BREAK case 242: YY_RULE_SETUP -#line 311 "../s/bif.l" -/* ignore (Linux only) */ +#line 310 "../s/bif.l" +yylval->string=strdup(yytext+1); yylval->string[strlen(yytext)-2]=0; return tok::QFILENAME; YY_BREAK case 243: YY_RULE_SETUP #line 312 "../s/bif.l" -printf("WARNING: bad character! '%s' (0x%02X)\n",yytext,yytext[0]); +yylloc->step (); YY_BREAK case 244: +/* rule 244 can match eol */ YY_RULE_SETUP #line 313 "../s/bif.l" +yylloc->lines (yyleng); yylloc->step (); + YY_BREAK +case 245: +YY_RULE_SETUP +#line 314 "../s/bif.l" +/* ignore (Linux only) */ + YY_BREAK +case 246: +YY_RULE_SETUP +#line 315 "../s/bif.l" +printf("WARNING: bad character! '%s' (0x%02X)\n",yytext,yytext[0]); + YY_BREAK +case 247: +YY_RULE_SETUP +#line 316 "../s/bif.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 2928 "../bisonflex/bif.yy.cpp" +#line 2947 "../bisonflex/bif.yy.cpp" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -3326,7 +3345,7 @@ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1103 ) + if ( yy_current_state >= 1111 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -3359,11 +3378,11 @@ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1103 ) + if ( yy_current_state >= 1111 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 1102); + yy_is_jam = (yy_current_state == 1110); return yy_is_jam ? 0 : yy_current_state; } @@ -3973,7 +3992,7 @@ /* %ok-for-header */ -#line 313 "../s/bif.l" +#line 316 "../s/bif.l" diff -Nru xilinx-bootgen-2021.2/bifoptions.cpp xilinx-bootgen-2022.1/bifoptions.cpp --- xilinx-bootgen-2021.2/bifoptions.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/bifoptions.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -390,7 +390,7 @@ std::ifstream f(filename.c_str()); if (!f) { - LOG_ERROR("Cannot read file - %s", regInitFile.c_str()); + LOG_ERROR("Cannot read file - %s", filename.c_str()); } regInitFile = filename; LOG_TRACE("Setting Register initialization file as %s", regInitFile.c_str()); @@ -420,7 +420,7 @@ std::ifstream f(filename.c_str()); if (!f) { - LOG_ERROR("Cannot read file - %s", regInitFile.c_str()); + LOG_ERROR("Cannot read file - %s", filename.c_str()); } udfBhFile = filename; LOG_TRACE("Setting UDF of BH as %s", udfBhFile.c_str()); @@ -1375,7 +1375,7 @@ /******************************************************************************/ void PartitionBifOptions::SetRevokeId(uint32_t id) { - if (revokeId > 0xFF) + if (id > 0xFF) { LOG_ERROR("revoke_id can only take values from 0x0 to 0xFF."); } @@ -1801,6 +1801,12 @@ } /******************************************************************************/ +std::string BifOptions::GetUserKeysFileName(void) +{ + return userKeyFile; +} + +/******************************************************************************/ std::string BifOptions::GetUdfBhFile(void) { return udfBhFile; @@ -1865,6 +1871,12 @@ } /******************************************************************************/ +void BifOptions::SetPdiType(PartitionType::Type type) +{ + pdiType = type; +} + +/******************************************************************************/ void BifOptions::SetBypassIdcodeFlag(bool flag) { bypassIdCode = flag; diff -Nru xilinx-bootgen-2021.2/bifoptions.h xilinx-bootgen-2022.1/bifoptions.h --- xilinx-bootgen-2021.2/bifoptions.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/bifoptions.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -395,6 +395,7 @@ OptKey::Type GetOptKey(void); void SetIdCode(uint32_t id); void SetExtendedIdCode(uint32_t id); + void SetPdiType(PartitionType::Type type); void SetBypassIdcodeFlag(bool flag); void SetAHwRoTFlag(bool flag); void SetSHwRoTFlag(bool flag); @@ -421,6 +422,7 @@ std::string GetEfuseKekIVFile(void); std::string GetEfuseUserKek0IVFile(void); std::string GetEfuseUserKek1IVFile(void); + std::string GetUserKeysFileName(void); std::string GetUdfBhFile(void); SplitMode::Type GetSplitMode(void); uint32_t GetIdCode(void); @@ -455,6 +457,7 @@ std::string pmcDataAesFile; uint32_t idCode; uint32_t extendedIdCode; + PartitionType::Type pdiType; bool bypassIdCode; bool aHwrot; bool sHwrot; @@ -467,6 +470,7 @@ uint32_t slrBootCnt; uint32_t slrConfigCnt; PartitionBifOptions* lastPartitionBifOption; + BootDevice::Type bootDevice; private: std::string regInitFile; std::string udfBhFile; @@ -492,7 +496,6 @@ std::string aesKeyFile; std::string userKeyFile; KeySource::Type keySourceEncryption; - BootDevice::Type bootDevice; uint32_t bootDeviceAddress; std::vector bootvectors; BhRsa::Type bhAuthEnable; diff -Nru xilinx-bootgen-2021.2/binfile.cpp xilinx-bootgen-2022.1/binfile.cpp --- xilinx-bootgen-2021.2/binfile.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/binfile.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2020 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -86,7 +86,7 @@ { /* ignore "doFill". Always fill! */ size_t length = end - start; - if (qspiDualMode == QspiMode::PARALLEL_GQSPI) + if (qspiDualMode == QspiMode::PARALLEL_GQSPI || qspiDualMode == QspiMode::PARALLEL_LQSPI) { for (size_t i = 0; i < length/2; i++) { @@ -131,7 +131,7 @@ } totalByteOutputCount += length; } - + /******************************************************************************/ void BinFile::Write(Binary::Address_t start, Binary::Length_t length, const uint8_t *buffer) { @@ -150,6 +150,32 @@ } ofs.write((const char*)buffer1, length / 2); ofs1.write((const char*)buffer2, length / 2); + } + else if (qspiDualMode == QspiMode::PARALLEL_LQSPI) + { + uint8_t* buffer1 = new uint8_t[length / 2]; + uint8_t* buffer2 = new uint8_t[length / 2]; + int k = 0; + for (uint64_t i = 0; i < length; i += 2, k++) + { + uint8_t lsb = 0, lsbNxt = 0; + uint8_t msb = 0, msbNxt = 0; + uint8_t tempData = writedata[i]; + uint8_t tempDataNxt = writedata[i + 1]; + for (int j = 0; j < 4; j++) + { + lsb = lsb | ((tempData & 0x1) << j); + msb = msb | (((tempData & 0x2) >> 1) << j); + tempData = tempData >> 2; + lsbNxt = lsbNxt | ((tempDataNxt & 0x1) << j); + msbNxt = msbNxt | (((tempDataNxt & 0x2) >> 1) << j); + tempDataNxt = tempDataNxt >> 2; + } + buffer1[k] = (lsb << 4) | lsbNxt; + buffer2[k] = (msb << 4) | msbNxt; + } + ofs.write((const char*)buffer1, length / 2); + ofs1.write((const char*)buffer2, length / 2); } else if (qspiDualMode == QspiMode::STACKED) { diff -Nru xilinx-bootgen-2021.2/bootgenenum.h xilinx-bootgen-2022.1/bootgenenum.h --- xilinx-bootgen-2021.2/bootgenenum.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/bootgenenum.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2020 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -405,7 +405,10 @@ REG_INIT, BOOTLOADER, SLR_BOOT, - SLR_CONFIG + SLR_CONFIG, + SLR_SLAVE, + SLR_SLAVE_BOOT, + SLR_SLAVE_CONFIG } Type; }; @@ -414,6 +417,7 @@ { typedef enum { + NONE, ALL, BH, IHT, diff -Nru xilinx-bootgen-2021.2/bootheader-zynqmp.cpp xilinx-bootgen-2022.1/bootheader-zynqmp.cpp --- xilinx-bootgen-2021.2/bootheader-zynqmp.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/bootheader-zynqmp.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -350,7 +350,7 @@ { /* The AC should be appended to a 64-byte aligned FSBL + PMU partition So find the pad length required for alignment and then add AC size */ - uint32_t padLength = (64 - (((bHTable->totalFsblLength + bHTable->totalPmuFwLength) & 63) & 63)); + uint32_t padLength = ((64 - ((bHTable->totalFsblLength + bHTable->totalPmuFwLength) & 63)) & 63); bHTable->totalFsblLength += (bi.headerAC->section->Length + padLength); SetHeaderChecksum(); } diff -Nru xilinx-bootgen-2021.2/bootimage-versal.cpp xilinx-bootgen-2022.1/bootimage-versal.cpp --- xilinx-bootgen-2021.2/bootimage-versal.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/bootimage-versal.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,34 +60,6 @@ /******************************************************************************/ VersalBootImage::~VersalBootImage() { - if (bootHeader) - { - delete bootHeader; - } - if (imageHeaderTable) - { - delete imageHeaderTable; - } - if (partitionHeaderTable) - { - delete partitionHeaderTable; - } - if (currentEncryptCtx) - { - delete currentEncryptCtx; - } - if (currentAuthCtx) - { - delete currentAuthCtx; - } - if (partitionOutput) - { - delete partitionOutput; - } - if (hash) - { - delete hash; - } } /******************************************************************************/ @@ -306,7 +278,8 @@ std::string baseFile = StringUtils::BaseName(it->filename); bool full_pdi = true; bool smap_exists = true; - + bool this_bootimage = false; + static uint32_t prev_image_block = 0; if (StringUtils::GetExtension(baseFile) == ".mcs") { LOG_ERROR("Parsing mcs format file is not supported : %s", baseFile.c_str()); @@ -528,7 +501,28 @@ } } offset += sizeof(VersalImageHeaderStructure); - subSysImageList.push_back(subsys); + if ((getenv("BOOTGEN_MERGE_IMAGES_WITH_SAME_ID") == NULL)) + { + if ((prev_image_block != current_image_block) || (this_bootimage == true)) + { + subSysImageList.push_back(subsys); + prev_image_block = current_image_block; + } + else + { + for (std::list::iterator subSysHdr = subSysImageList.begin(); subSysHdr != subSysImageList.end(); subSysHdr++) + { + if ((*subSysHdr)->GetSubSystemId() == subsys->GetSubSystemId()) + { + (*subSysHdr)->imgList.merge(subsys->imgList); + } + } + } + } + else + { + subSysImageList.push_back(subsys); + } } else { @@ -635,6 +629,7 @@ } offset += sizeof(VersalImageHeaderStructure); } + this_bootimage = true; } while (imageCount != 0); } @@ -1346,6 +1341,8 @@ { SubSysImageHeader *subSysImage = new SubSysImageHeader(*imgitr); bool bootimage_partition = false; + current_image_block++; + bool break_outer_loop = false; for (std::list::iterator partitr = (*imgitr)->partitionBifOptionsList.begin(); partitr != (*imgitr)->partitionBifOptionsList.end(); partitr++) { if ((*partitr)->bootImage) @@ -1385,6 +1382,20 @@ { subSysImage->SetSubSystemId(0x0); } + if ((getenv("BOOTGEN_MERGE_IMAGES_WITH_SAME_ID") == NULL)) + { + if (bootimage_partition == true) + { + for (std::list::iterator ssitr = subSysImageList.begin(); ssitr != subSysImageList.end(); ssitr++) + { + if (((*ssitr)->GetSubSystemId() == subSysImage->GetSubSystemId()) && !(img->IsBootloader() || img->GetDestCpu() == DestinationCPU::PMU)) + { + (*ssitr)->imgList.push_back(img); + break_outer_loop = true; + } + } + } + } if (subSysImage->GetDelayHandoffMode() || subSysImage->GetDelayLoadMode()) { if (img->IsBootloader()) @@ -1419,7 +1430,8 @@ } else { - subSysImage->imgList.push_back(img); + if (!break_outer_loop) + subSysImage->imgList.push_back(img); } } } @@ -1769,7 +1781,7 @@ /******************************************************************************/ void VersalBootImage::BuildAndLink(Binary* cache) { - if (imageList.size() == 0) + if (imageList.size() == 0 && options.GetSecureDebugAuthType() == Authentication::None) { LOG_WARNING("No partition images given"); } @@ -1817,7 +1829,6 @@ partitionHeaderList.clear(); if (createSubSystemPdis == true) { - AppendImagesInSubsystems(); ReplaceImages(); } else diff -Nru xilinx-bootgen-2021.2/bootimage-versal.h xilinx-bootgen-2022.1/bootimage-versal.h --- xilinx-bootgen-2021.2/bootimage-versal.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/bootimage-versal.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -65,5 +65,6 @@ void ConfigureEncryptionBlocks(ImageHeader * image, PartitionBifOptions* partitionBifOptions); void SetPmcdataFile(const std::string & filename); void SetPmcDataLoadAddress(Binary::Address_t addr); + uint32_t current_image_block; }; #endif diff -Nru xilinx-bootgen-2021.2/bootimage-zynqmp.cpp xilinx-bootgen-2022.1/bootimage-zynqmp.cpp --- xilinx-bootgen-2021.2/bootimage-zynqmp.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/bootimage-zynqmp.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -327,7 +327,7 @@ if (imageAuthBlock != 0) { acSize = encrPartLen / (imageAuthBlock * 1024 * 1024); - if (encrPartLen % imageAuthBlock != 0) + if (encrPartLen % (imageAuthBlock * 1024 * 1024) != 0) { acSize++; } diff -Nru xilinx-bootgen-2021.2/bootimage.cpp xilinx-bootgen-2022.1/bootimage.cpp --- xilinx-bootgen-2021.2/bootimage.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/bootimage.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -79,8 +79,23 @@ bifOptionList = options.bifOptionsList; BootImage* currentbi = NULL; uint8_t index = 0; + bool ssit_bif = false; + for (std::vector::iterator bifoptions = bifOptionList.begin(); bifoptions != bifOptionList.end(); bifoptions++) + { + if ((*bifoptions)->slrBootCnt != 0 || (*bifoptions)->slrConfigCnt != 0) + { + ssit_bif = true; + break; + } + } + for (std::vector::iterator bifoptions = bifOptionList.begin(); bifoptions != bifOptionList.end();bifoptions++) { + if (((*bifoptions)->slrBootCnt == 0 || (*bifoptions)->slrConfigCnt == 0) && ssit_bif) + { + (*bifoptions)->pdiType = PartitionType::SLR_SLAVE; + } + if (options.archType == Arch::ZYNQMP) { currentbi = new ZynqMpBootImage(options, index); @@ -97,6 +112,14 @@ if (currentbi != NULL) { currentbi->Add(*bifoptions); + if (currentbi->bootloaderFound && (*bifoptions)->pdiType == PartitionType::SLR_SLAVE) + { + (*bifoptions)->pdiType = PartitionType::SLR_SLAVE_BOOT; + } + else + { + (*bifoptions)->pdiType = PartitionType::SLR_SLAVE_CONFIG; + } bootImages.push_back(currentbi); } Output(options, index); diff -Nru xilinx-bootgen-2021.2/bootimage.h xilinx-bootgen-2022.1/bootimage.h --- xilinx-bootgen-2021.2/bootimage.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/bootimage.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,6 +35,11 @@ #include "partitionheadertable.h" #include "bifoptions.h" +#define R5_TCM_START_ADDRESS 0x0000 +#define R5_BTCM_START_ADDRESS 0x20000 +#define R5_TCM_BANK_LENGTH 0x10000 +#define PMU_RAM_END_ADDRESS 0xFFDDFFFF + /* Forward class declarations */ class Options; class BifOptions; diff -Nru xilinx-bootgen-2021.2/cdo-alloc.h xilinx-bootgen-2022.1/cdo-alloc.h --- xilinx-bootgen-2021.2/cdo-alloc.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/cdo-alloc.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,6 +1,6 @@ // 67d7842dbbe25473c3c32b93c0da8047785f30d78e8a024de1b57352245f9689 /****************************************************************************** -* Copyright 2019-2021 Xilinx, Inc. +* Copyright 2019-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,11 +18,9 @@ #ifndef D_cdo_alloc #define D_cdo_alloc -#include "dyn_link.h" - -CDOUTIL_EXPORT void * myalloc(size_t len); -CDOUTIL_EXPORT void * myalloc_zero(size_t len); -CDOUTIL_EXPORT void * myrealloc(void * p, size_t len); -CDOUTIL_EXPORT void myfree(void * p); +void * myalloc(size_t len); +void * myalloc_zero(size_t len); +void * myrealloc(void * p, size_t len); +void myfree(void * p); #endif /* D_cdo_alloc */ diff -Nru xilinx-bootgen-2021.2/cdo-binary.c xilinx-bootgen-2022.1/cdo-binary.c --- xilinx-bootgen-2021.2/cdo-binary.c 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/cdo-binary.c 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2019-2021 Xilinx, Inc. +* Copyright 2019-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -99,6 +99,8 @@ CMD2_BLOCK_BEGIN = 0x11bU, CMD2_BLOCK_END = 0x11cU, CMD2_BREAK = 0x11dU, + CMD2_OT_CHECK = 0x11eU, + CMD2_PSM_SEQUENCE = 0x11fU, /* PM Commands */ CMD2_PM_GET_API_VERSION = 0x201U, @@ -150,6 +152,8 @@ CMD2_PM_INIT_NODE = 0x23eU, CMD2_PM_FEATURE_CHECK = 0x23fU, CMD2_PM_ISO_CONTROL = 0x240U, + CMD2_PM_ACTIVATE_SUBSYSTEM = 0x241U, + CMD2_PM_SET_NODE_ACCESS = 0x242U, /* NPI Commands */ CMD2_NPI_SEQ = 0x301U, @@ -563,6 +567,19 @@ cdocmd_add_break(seq, args > 0 ? u32xe(p[i+0]) : 1); break; } + case CMD2_OT_CHECK: + if (args != 1) goto unexpected; + cdocmd_add_ot_check(seq, u32xe(p[i+0])); + break; + case CMD2_PSM_SEQUENCE: { + uint32_t i2 = i; + cdocmd_add_psm_sequence(seq); + if (decode_v2_cmd(seq, p, &i2, i2 + args, be)) { + goto error; + } + cdocmd_add_end(seq); + break; + } case CMD2_NPI_SEQ: if (args != 2) goto unexpected; cdocmd_add_npi_seq(seq, u32xe(p[i+0]), u32xe(p[i+1])); @@ -777,6 +794,14 @@ if (args != 2) goto unexpected; cdocmd_add_pm_iso_control(seq, u32xe(p[i+0]), u32xe(p[i+1])); break; + case CMD2_PM_ACTIVATE_SUBSYSTEM: + if (args != 1) goto unexpected; + cdocmd_add_pm_activate_subsystem(seq, u32xe(p[i+0])); + break; + case CMD2_PM_SET_NODE_ACCESS: + if (args < 1) goto unexpected; + cdocmd_add_pm_set_node_access(seq, u32xe(p[i+0]), args - 1, &p[i+1], be); + break; case CMD2_CFU_SET_CRC32: if (args < 1) goto unexpected; if (u32xe(p[i+0]) == 0) { @@ -1233,6 +1258,7 @@ CdoCommand * cmd = all2cmds(l); switch (cmd->type) { case CdoCmdProc: + case CdoCmdPsmSequence: case CdoCmdBegin: level++; break; @@ -1593,6 +1619,27 @@ p[pos++] = u32xe(cmd->value); } break; + case CdoCmdOtCheck: + hdr2(&p, &pos, CMD2_OT_CHECK, 1, be); + p[pos++] = u32xe(cmd->value); + break; + case CdoCmdPsmSequence: { + uint32_t pos_save = pos; + uint32_t payload_start; + LINK * blockend = find_block_end(l, lh); + hdr2(&p, &pos, CMD2_PSM_SEQUENCE, 0, be); + payload_start = pos; + p = encode_v2_cmd(l, blockend, &pos, be); + hdr2(&p, &pos_save, CMD2_PSM_SEQUENCE, pos - payload_start, be); + if (pos_save != payload_start) { + /* Header grew, regenerate payload */ + pos = pos_save; + p = encode_v2_cmd(l, blockend, &pos, be); + } + l = blockend; + if (l != lh) l = l->next; + break; + } case CdoCmdNpiSeq: hdr2(&p, &pos, CMD2_NPI_SEQ, 2, be); @@ -1882,6 +1929,17 @@ p[pos++] = u32xe(cmd->id); p[pos++] = u32xe(cmd->value); break; + case CdoCmdPmActivateSubsystem: + hdr2(&p, &pos, CMD2_PM_ACTIVATE_SUBSYSTEM, 1, be); + p[pos++] = u32xe(cmd->id); + break; + case CdoCmdPmSetNodeAccess: + hdr2(&p, &pos, CMD2_PM_SET_NODE_ACCESS, 1 + cmd->count, be); + p[pos++] = u32xe(cmd->id); + memcpy(p + pos, cmd->buf, cmd->count * sizeof(uint32_t)); + byte_swap_buffer(p + pos, cmd->count, be); + pos += cmd->count; + break; case CdoCmdCfuSetCrc32: if (cmd->flags != 0) { hdr2(&p, &pos, CMD2_CFU_SET_CRC32, 2, be); @@ -1975,6 +2033,7 @@ } return encode(seq, sizep, be); } + void search_for_sync_points(void) { num_of_sync_points = 0; diff -Nru xilinx-bootgen-2021.2/cdo-binary.h xilinx-bootgen-2022.1/cdo-binary.h --- xilinx-bootgen-2021.2/cdo-binary.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/cdo-binary.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2019-2020 Xilinx, Inc. +* Copyright 2019-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,13 +19,13 @@ #include "cdo-command.h" -CDOUTIL_EXPORT void cdobinary_set_verbose(uint32_t verbose); -CDOUTIL_EXPORT void cdobinary_set_auto_align(uint32_t enable); -CDOUTIL_EXPORT void cdobinary_set_add_offset(uint32_t enable); -CDOUTIL_EXPORT CdoSequence * decode_cdo_binary(const void * data, size_t len); -CDOUTIL_EXPORT void * cdoseq_to_binary(CdoSequence * seq, size_t * sizep, uint32_t be); -CDOUTIL_EXPORT int is_cdo_data(void * data, size_t size); -CDOUTIL_EXPORT uint32_t* get_slr_sync_point_offsets(void); -CDOUTIL_EXPORT void search_for_sync_points(void); -CDOUTIL_EXPORT size_t get_num_of_sync_points(void); +void cdobinary_set_verbose(uint32_t verbose); +void cdobinary_set_auto_align(uint32_t enable); +void cdobinary_set_add_offset(uint32_t enable); +CdoSequence * decode_cdo_binary(const void * data, size_t len); +void * cdoseq_to_binary(CdoSequence * seq, size_t * sizep, uint32_t be); +int is_cdo_data(void * data, size_t size); +uint32_t* get_slr_sync_point_offsets(void); +void search_for_sync_points(void); +size_t get_num_of_sync_points(void); #endif /* D_cdo_binary */ diff -Nru xilinx-bootgen-2021.2/cdo-command.c xilinx-bootgen-2022.1/cdo-command.c --- xilinx-bootgen-2021.2/cdo-command.c 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/cdo-command.c 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2019-2021 Xilinx, Inc. +* Copyright 2019-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ #include #include #include +#include #include "cdo-alloc.h" #include "cdo-command.h" UserKeys user_keys; @@ -104,27 +105,39 @@ list_add_last(&newcmd->link_all, &cmd->link_all); } +static int myrand(void) +{ + static unsigned long next; + static int firsttime = 1; + if (firsttime) { + firsttime = 0; + next = time(NULL); + } + next = next * 1103515245 + 12345; + return((unsigned)(next/65536) % 32768); +} + static uint8_t randchar() { static char chrs[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - return chrs[rand() % (sizeof chrs - 1)]; + return chrs[myrand() % (sizeof chrs - 1)]; } static uint32_t randu32() { - uint32_t width = rand() & 3; - uint32_t value = rand() & 255; + uint32_t width = myrand() & 3; + uint32_t value = myrand() & 255; while (width-- > 0) { value <<= 8; - value |= rand() & 255; + value |= myrand() & 255; } return value; } static uint64_t randu64() { - uint64_t width = rand() & 7; - uint64_t value = rand() & 255; + uint64_t width = myrand() & 7; + uint64_t value = myrand() & 255; while (width-- > 0) { value <<= 8; - value |= rand() & 255; + value |= myrand() & 255; } return value; } @@ -141,6 +154,7 @@ type == CdoCmdComment || type == CdoCmdSetBaseAddress || (type == CdoCmdProc && level != 0) || + (type == CdoCmdPsmSequence && level != 0) || (type == CdoCmdBegin && level >= (randu32() & 3)) || (type == CdoCmdEnd && level == 0) || (type == CdoCmdBreak && level == 0)); @@ -174,7 +188,8 @@ cmd->type == CdoCmdPmAddNode || cmd->type == CdoCmdPmAddNodeParent || cmd->type == CdoCmdPmAddRequirement || - cmd->type == CdoCmdPmInitNode) { + cmd->type == CdoCmdPmInitNode || + cmd->type == CdoCmdPmSetNodeAccess) { uint32_t * p; uint32_t i; cmd->count = (cmd->count & 15) + 1; @@ -183,7 +198,7 @@ p[i] = randu32(); } if (cmd->type == CdoCmdDmaXfer) { - if (rand() & 1) cmd->srcaddr = 0; + if (myrand() & 1) cmd->srcaddr = 0; if (cmd->srcaddr != 0) { free(cmd->buf); cmd->buf = NULL; @@ -208,6 +223,7 @@ cmd->value = (cmd->value % level) + 1; } if (cmd->type == CdoCmdProc) level++; + if (cmd->type == CdoCmdPsmSequence) level++; if (cmd->type == CdoCmdBegin) level++; if (cmd->type == CdoCmdEnd) level--; add_command(seq, cmd); @@ -277,7 +293,6 @@ } } } - cmd->buf = copy_buf(buf, count, be); return cmd; } @@ -710,6 +725,20 @@ add_command(seq, cmd); } +void cdocmd_add_pm_activate_subsystem(CdoSequence * seq, uint32_t ssid) { + CdoCommand * cmd = cdocmd_alloc(CdoCmdPmActivateSubsystem); + cmd->id = ssid; + add_command(seq, cmd); +} + +void cdocmd_add_pm_set_node_access(CdoSequence * seq, uint32_t nodeid, uint32_t count, void * buf, uint32_t be) { + CdoCommand * cmd = cdocmd_alloc(CdoCmdPmSetNodeAccess); + cmd->id = nodeid; + cmd->count = count; + cmd->buf = copy_buf(buf, count, be); + add_command(seq, cmd); +} + void cdocmd_add_cfu_set_crc32(CdoSequence * seq, uint32_t type, uint32_t value) { CdoCommand * cmd = cdocmd_alloc(CdoCmdCfuSetCrc32); cmd->flags = type; @@ -868,6 +897,17 @@ add_command(seq, cmd); } +void cdocmd_add_ot_check(CdoSequence * seq, uint32_t value) { + CdoCommand * cmd = cdocmd_alloc(CdoCmdOtCheck); + cmd->value = value; + add_command(seq, cmd); +} + +void cdocmd_add_psm_sequence(CdoSequence * seq) { + CdoCommand * cmd = cdocmd_alloc(CdoCmdPsmSequence); + add_command(seq, cmd); +} + void cdocmd_add_pm_register_notifier(CdoSequence * seq, uint32_t nodeid, uint32_t mask, uint32_t arg1, uint32_t arg2) { CdoCommand * cmd = cdocmd_alloc(CdoCmdPmRegisterNotifier); cmd->id = nodeid; diff -Nru xilinx-bootgen-2021.2/cdo-command.h xilinx-bootgen-2022.1/cdo-command.h --- xilinx-bootgen-2021.2/cdo-command.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/cdo-command.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2019-2021 Xilinx, Inc. +* Copyright 2019-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,8 +21,6 @@ #include #include "link.h" -#include "dyn_link.h" - #define is_be_host() (0) #define DEFAULT_CDO_VERSION 0x200 @@ -77,6 +75,8 @@ CdoCmdBegin, CdoCmdEnd, CdoCmdBreak, + CdoCmdOtCheck, + CdoCmdPsmSequence, CdoCmdNpiSeq, CdoCmdNpiPreCfg, CdoCmdNpiWrite, @@ -129,6 +129,8 @@ CdoCmdPmInitNode, CdoCmdPmFeatureCheck, CdoCmdPmIsoControl, + CdoCmdPmActivateSubsystem, + CdoCmdPmSetNodeAccess, CdoCmdCfuSetCrc32, CdoCmdCfuDecompress, CdoCmdCfuCramRW, @@ -159,115 +161,119 @@ void * buf; }; -CDOUTIL_EXPORT CdoSequence * cdocmd_create_sequence(void); -CDOUTIL_EXPORT void cdocmd_delete_sequence(CdoSequence * seq); -CDOUTIL_EXPORT CdoCommand * cdocmd_alloc(CdoCmdType type); -CDOUTIL_EXPORT void cdocmd_free(CdoCommand * cmd); -CDOUTIL_EXPORT CdoCommand * cdocmd_duplicate(CdoCommand * cmd); -CDOUTIL_EXPORT void cdocmd_set_default_sequence(CdoSequence * seq); -CDOUTIL_EXPORT void cdocmd_append_command(CdoSequence * seq, CdoCommand * newcmd); -CDOUTIL_EXPORT void cdocmd_insert_command(CdoCommand * cmd, CdoCommand * newcmd); -CDOUTIL_EXPORT void cdocmd_add_random_command(CdoSequence * seq, uint32_t * levelp); -CDOUTIL_EXPORT void cdocmd_add_generic_command(CdoSequence * seq, uint32_t id, void * buf, uint32_t count, uint32_t be); -CDOUTIL_EXPORT void cdocmd_add_comment(CdoSequence * seq, const char * comment, ...); -CDOUTIL_EXPORT void cdocmd_add_section(CdoSequence * seq, uint32_t secid); -CDOUTIL_EXPORT void cdocmd_add_include(CdoSequence * seq, const char * name); -CDOUTIL_EXPORT void cdocmd_add_mask_poll(CdoSequence * seq, uint64_t addr, uint32_t mask, uint32_t value, uint32_t count, uint32_t flags); -CDOUTIL_EXPORT void cdocmd_add_mask_write(CdoSequence * seq, uint64_t addr, uint32_t mask, uint32_t value); -CDOUTIL_EXPORT void cdocmd_add_write(CdoSequence * seq, uint64_t addr, uint32_t value); -CDOUTIL_EXPORT void cdocmd_add_delay(CdoSequence * seq, uint32_t delay); -CDOUTIL_EXPORT void cdocmd_add_block_write(CdoSequence * seq, uint64_t addr, uint32_t count, void * buf, uint32_t be); -CDOUTIL_EXPORT void cdocmd_add_keyhole_write(CdoSequence * seq, uint64_t addr, uint32_t keyhole_size, uint32_t count, void * buf, uint32_t be); -CDOUTIL_EXPORT void cdocmd_add_block_set(CdoSequence * seq, uint64_t addr, uint32_t count, uint32_t value); -CDOUTIL_EXPORT void cdocmd_add_dma_xfer(CdoSequence * seq, uint64_t srcaddr, uint64_t dstaddr, uint32_t count, uint32_t flags, void * buf, uint32_t be); -CDOUTIL_EXPORT void cdocmd_add_npi_seq(CdoSequence * seq, uint32_t addr, uint32_t flags); -CDOUTIL_EXPORT void cdocmd_add_npi_precfg(CdoSequence * seq, uint32_t addr, uint32_t flags); -CDOUTIL_EXPORT void cdocmd_add_npi_write(CdoSequence * seq, uint32_t addr, uint32_t flags, uint32_t count, void * buf, uint32_t be); -CDOUTIL_EXPORT void cdocmd_add_npi_shutdown(CdoSequence * seq, uint32_t addr, uint32_t flags); - -CDOUTIL_EXPORT void cdocmd_add_pm_get_api_version(CdoSequence * seq); -CDOUTIL_EXPORT void cdocmd_add_pm_get_device_status(CdoSequence * seq, uint32_t nodeid); -CDOUTIL_EXPORT void cdocmd_add_pm_register_notifier(CdoSequence * seq, uint32_t nodeid, uint32_t mask, uint32_t arg1, uint32_t arg2); -CDOUTIL_EXPORT void cdocmd_add_pm_request_suspend(CdoSequence * seq, uint32_t nodeid, uint32_t ack, uint32_t latency, uint32_t state); -CDOUTIL_EXPORT void cdocmd_add_pm_self_suspend(CdoSequence * seq, uint32_t nodeid, uint32_t latency, uint32_t state, uint64_t addr); -CDOUTIL_EXPORT void cdocmd_add_pm_force_powerdown(CdoSequence * seq, uint32_t nodeid, uint32_t ack); -CDOUTIL_EXPORT void cdocmd_add_pm_abort_suspend(CdoSequence * seq, uint32_t reason, uint32_t nodeid); -CDOUTIL_EXPORT void cdocmd_add_pm_request_wakeup(CdoSequence * seq, uint32_t nodeid, uint64_t addr, uint32_t ack); -CDOUTIL_EXPORT void cdocmd_add_pm_set_wakeup_source(CdoSequence * seq, uint32_t target, uint32_t source, uint32_t enable); -CDOUTIL_EXPORT void cdocmd_add_pm_system_shutdown(CdoSequence * seq, uint32_t type, uint32_t subtype); -CDOUTIL_EXPORT void cdocmd_add_pm_request_device(CdoSequence * seq, uint32_t nodeid, uint32_t capabilities, uint32_t qos, uint32_t ack); -CDOUTIL_EXPORT void cdocmd_add_pm_release_device(CdoSequence * seq, uint32_t nodeid); -CDOUTIL_EXPORT void cdocmd_add_pm_set_requirement(CdoSequence * seq, uint32_t nodeid, uint32_t capabilities, uint32_t qos, uint32_t ack); -CDOUTIL_EXPORT void cdocmd_add_pm_set_max_latency(CdoSequence * seq, uint32_t nodeid, uint32_t latency); -CDOUTIL_EXPORT void cdocmd_add_pm_reset_assert(CdoSequence * seq, uint32_t nodeid, uint32_t action); -CDOUTIL_EXPORT void cdocmd_add_pm_reset_get_status(CdoSequence * seq, uint32_t nodeid); -CDOUTIL_EXPORT void cdocmd_add_pm_pinctrl_request(CdoSequence * seq, uint32_t pinid); -CDOUTIL_EXPORT void cdocmd_add_pm_pinctrl_release(CdoSequence * seq, uint32_t pinid); -CDOUTIL_EXPORT void cdocmd_add_pm_pinctrl_get_function(CdoSequence * seq, uint32_t pinid); -CDOUTIL_EXPORT void cdocmd_add_pm_pinctrl_set_function(CdoSequence * seq, uint32_t pinid, uint32_t funcid); -CDOUTIL_EXPORT void cdocmd_add_pm_pinctrl_config_param_get(CdoSequence * seq, uint32_t pinid, uint32_t param); -CDOUTIL_EXPORT void cdocmd_add_pm_pinctrl_config_param_set(CdoSequence * seq, uint32_t pinid, uint32_t param, uint32_t value); -CDOUTIL_EXPORT void cdocmd_add_pm_ioctl(CdoSequence * seq, uint32_t nodeid, uint32_t ioctlid, void * buf, uint32_t count, uint32_t be); -CDOUTIL_EXPORT void cdocmd_add_pm_query_data(CdoSequence * seq, uint32_t id, void * buf, uint32_t count, uint32_t be); -CDOUTIL_EXPORT void cdocmd_add_pm_clock_enable(CdoSequence * seq, uint32_t nodeid); -CDOUTIL_EXPORT void cdocmd_add_pm_clock_disable(CdoSequence * seq, uint32_t nodeid); -CDOUTIL_EXPORT void cdocmd_add_pm_clock_getstate(CdoSequence * seq, uint32_t nodeid); -CDOUTIL_EXPORT void cdocmd_add_pm_clock_setdivider(CdoSequence * seq, uint32_t nodeid, uint32_t div); -CDOUTIL_EXPORT void cdocmd_add_pm_clock_getdivider(CdoSequence * seq, uint32_t nodeid); -CDOUTIL_EXPORT void cdocmd_add_pm_clock_setrate(CdoSequence * seq, uint32_t nodeid, uint32_t rate); -CDOUTIL_EXPORT void cdocmd_add_pm_clock_getrate(CdoSequence * seq, uint32_t nodeid); -CDOUTIL_EXPORT void cdocmd_add_pm_clock_setparent(CdoSequence * seq, uint32_t nodeid, uint32_t parentid); -CDOUTIL_EXPORT void cdocmd_add_pm_clock_getparent(CdoSequence * seq, uint32_t nodeid); -CDOUTIL_EXPORT void cdocmd_add_pm_pll_set_parameter(CdoSequence * seq, uint32_t nodeid, uint32_t param, uint32_t value); -CDOUTIL_EXPORT void cdocmd_add_pm_pll_get_parameter(CdoSequence * seq, uint32_t nodeid, uint32_t param); -CDOUTIL_EXPORT void cdocmd_add_pm_pll_set_mode(CdoSequence * seq, uint32_t nodeid, uint32_t val); -CDOUTIL_EXPORT void cdocmd_add_pm_pll_get_mode(CdoSequence * seq, uint32_t nodeid); -CDOUTIL_EXPORT void cdocmd_add_pm_add_subsystem(CdoSequence * seq, uint32_t ssid); -CDOUTIL_EXPORT void cdocmd_add_pm_destroy_subsystem(CdoSequence * seq, uint32_t ssid); -CDOUTIL_EXPORT void cdocmd_add_pm_describe_nodes(CdoSequence * seq, void * buf, uint32_t count, uint32_t be); -CDOUTIL_EXPORT void cdocmd_add_pm_add_node(CdoSequence * seq, uint32_t nodeid, uint32_t count, void * buf, uint32_t be); -CDOUTIL_EXPORT void cdocmd_add_pm_add_node_parent(CdoSequence * seq, uint32_t nodeid, uint32_t count, void * buf, uint32_t be); -CDOUTIL_EXPORT void cdocmd_add_pm_add_node_name(CdoSequence * seq, uint32_t nodeid, const char * name); -CDOUTIL_EXPORT void cdocmd_add_pm_add_requirement(CdoSequence * seq, uint32_t ssid, uint32_t nodeid, uint32_t flags, uint32_t count, void * buf, uint32_t be); -CDOUTIL_EXPORT void cdocmd_add_pm_set_current_subsystem(CdoSequence * seq, uint32_t ssid); -CDOUTIL_EXPORT void cdocmd_add_pm_init_node(CdoSequence * seq, uint32_t nodeid, uint32_t function, uint32_t count, void * buf, uint32_t be); -CDOUTIL_EXPORT void cdocmd_add_pm_feature_check(CdoSequence * seq, uint32_t id); -CDOUTIL_EXPORT void cdocmd_add_pm_iso_control(CdoSequence * seq, uint32_t nodeid, uint32_t value); - -CDOUTIL_EXPORT void cdocmd_add_cfu_set_crc32(CdoSequence * seq, uint32_t type, uint32_t value); -CDOUTIL_EXPORT void cdocmd_add_cfu_decompress(CdoSequence * seq, uint32_t type); -CDOUTIL_EXPORT void cdocmd_add_cfu_cram_rw(CdoSequence * seq, uint32_t value); -CDOUTIL_EXPORT void cdocmd_add_cfu_seu_go(CdoSequence * seq, uint32_t value); -CDOUTIL_EXPORT void cdocmd_add_cfu_crc8_dis(CdoSequence * seq, uint32_t type); -CDOUTIL_EXPORT void cdocmd_add_cfu_ssi_per_slr_pr(CdoSequence * seq, uint32_t value); -CDOUTIL_EXPORT void cdocmd_add_cfu_gsr_gsc(CdoSequence * seq, uint32_t value); -CDOUTIL_EXPORT void cdocmd_add_cfu_gcap_clk_en(CdoSequence * seq, uint32_t value); -CDOUTIL_EXPORT void cdocmd_add_cfu_cfi_type(CdoSequence * seq, uint32_t value); -CDOUTIL_EXPORT void cdocmd_add_cframe_read(CdoSequence * seq, uint32_t param, uint64_t addr, uint32_t read_count, uint32_t count, void * buf, uint32_t be); -CDOUTIL_EXPORT void cdocmd_add_ssit_sync_master(CdoSequence * seq); -CDOUTIL_EXPORT void cdocmd_add_ssit_sync_slaves(CdoSequence * seq, uint32_t mask, uint32_t count); -CDOUTIL_EXPORT void cdocmd_add_ssit_wait_slaves(CdoSequence * seq, uint32_t mask, uint32_t count); -CDOUTIL_EXPORT void cdocmd_add_nop(CdoSequence * seq, uint32_t count, void * buf, uint32_t be); -CDOUTIL_EXPORT void cdocmd_add_event_logging(CdoSequence * seq, uint32_t subcmd, uint32_t count, void * buf, uint32_t be); -CDOUTIL_EXPORT void cdocmd_add_set_board(CdoSequence * seq, const char * name); -CDOUTIL_EXPORT void cdocmd_add_set_plm_wdt(CdoSequence * seq, uint32_t nodeid, uint32_t periodicity); -CDOUTIL_EXPORT void cdocmd_add_log_string(CdoSequence * seq, const char * str); -CDOUTIL_EXPORT void cdocmd_add_log_address(CdoSequence * seq, uint64_t srcaddr); -CDOUTIL_EXPORT void cdocmd_add_marker(CdoSequence * seq, uint32_t value, const char * str); -CDOUTIL_EXPORT void cdocmd_add_proc(CdoSequence * seq, uint32_t value); -CDOUTIL_EXPORT void cdocmd_add_begin(CdoSequence * seq, const char * str); -CDOUTIL_EXPORT void cdocmd_add_end(CdoSequence * seq); -CDOUTIL_EXPORT void cdocmd_add_break(CdoSequence * seq, uint32_t value); -CDOUTIL_EXPORT void cdocmd_add_ldr_set_image_info(CdoSequence * seq, uint32_t nodeid, uint32_t uid, uint32_t puid, uint32_t funcid); -CDOUTIL_EXPORT void cdocmd_add_em_set_action(CdoSequence * seq, uint32_t nodeid, uint32_t action, uint32_t mask); -CDOUTIL_EXPORT void cdocmd_insert_seq(CdoCommand * cmd, CdoSequence * seq); -CDOUTIL_EXPORT void cdocmd_concat_seq(CdoSequence * seq, CdoSequence * seq2); - -CDOUTIL_EXPORT void cdocmd_rewrite_address(CdoSequence * seq); -CDOUTIL_EXPORT void cdocmd_rewrite_block(CdoSequence * seq); -CDOUTIL_EXPORT void cdocmd_rewrite_sequential(CdoSequence * seq); -CDOUTIL_EXPORT void cdocmd_rewrite_repeat(CdoSequence * seq); -CDOUTIL_EXPORT void cdocmd_remove_comments(CdoSequence * seq); +CdoSequence * cdocmd_create_sequence(void); +void cdocmd_delete_sequence(CdoSequence * seq); +CdoCommand * cdocmd_alloc(CdoCmdType type); +void cdocmd_free(CdoCommand * cmd); +CdoCommand * cdocmd_duplicate(CdoCommand * cmd); +void cdocmd_set_default_sequence(CdoSequence * seq); +void cdocmd_append_command(CdoSequence * seq, CdoCommand * newcmd); +void cdocmd_insert_command(CdoCommand * cmd, CdoCommand * newcmd); +void cdocmd_add_random_command(CdoSequence * seq, uint32_t * levelp); +void cdocmd_add_generic_command(CdoSequence * seq, uint32_t id, void * buf, uint32_t count, uint32_t be); +void cdocmd_add_comment(CdoSequence * seq, const char * comment, ...); +void cdocmd_add_section(CdoSequence * seq, uint32_t secid); +void cdocmd_add_include(CdoSequence * seq, const char * name); +void cdocmd_add_mask_poll(CdoSequence * seq, uint64_t addr, uint32_t mask, uint32_t value, uint32_t count, uint32_t flags); +void cdocmd_add_mask_write(CdoSequence * seq, uint64_t addr, uint32_t mask, uint32_t value); +void cdocmd_add_write(CdoSequence * seq, uint64_t addr, uint32_t value); +void cdocmd_add_delay(CdoSequence * seq, uint32_t delay); +void cdocmd_add_block_write(CdoSequence * seq, uint64_t addr, uint32_t count, void * buf, uint32_t be); +void cdocmd_add_keyhole_write(CdoSequence * seq, uint64_t addr, uint32_t keyhole_size, uint32_t count, void * buf, uint32_t be); +void cdocmd_add_block_set(CdoSequence * seq, uint64_t addr, uint32_t count, uint32_t value); +void cdocmd_add_dma_xfer(CdoSequence * seq, uint64_t srcaddr, uint64_t dstaddr, uint32_t count, uint32_t flags, void * buf, uint32_t be); +void cdocmd_add_npi_seq(CdoSequence * seq, uint32_t addr, uint32_t flags); +void cdocmd_add_npi_precfg(CdoSequence * seq, uint32_t addr, uint32_t flags); +void cdocmd_add_npi_write(CdoSequence * seq, uint32_t addr, uint32_t flags, uint32_t count, void * buf, uint32_t be); +void cdocmd_add_npi_shutdown(CdoSequence * seq, uint32_t addr, uint32_t flags); + +void cdocmd_add_pm_get_api_version(CdoSequence * seq); +void cdocmd_add_pm_get_device_status(CdoSequence * seq, uint32_t nodeid); +void cdocmd_add_pm_register_notifier(CdoSequence * seq, uint32_t nodeid, uint32_t mask, uint32_t arg1, uint32_t arg2); +void cdocmd_add_pm_request_suspend(CdoSequence * seq, uint32_t nodeid, uint32_t ack, uint32_t latency, uint32_t state); +void cdocmd_add_pm_self_suspend(CdoSequence * seq, uint32_t nodeid, uint32_t latency, uint32_t state, uint64_t addr); +void cdocmd_add_pm_force_powerdown(CdoSequence * seq, uint32_t nodeid, uint32_t ack); +void cdocmd_add_pm_abort_suspend(CdoSequence * seq, uint32_t reason, uint32_t nodeid); +void cdocmd_add_pm_request_wakeup(CdoSequence * seq, uint32_t nodeid, uint64_t addr, uint32_t ack); +void cdocmd_add_pm_set_wakeup_source(CdoSequence * seq, uint32_t target, uint32_t source, uint32_t enable); +void cdocmd_add_pm_system_shutdown(CdoSequence * seq, uint32_t type, uint32_t subtype); +void cdocmd_add_pm_request_device(CdoSequence * seq, uint32_t nodeid, uint32_t capabilities, uint32_t qos, uint32_t ack); +void cdocmd_add_pm_release_device(CdoSequence * seq, uint32_t nodeid); +void cdocmd_add_pm_set_requirement(CdoSequence * seq, uint32_t nodeid, uint32_t capabilities, uint32_t qos, uint32_t ack); +void cdocmd_add_pm_set_max_latency(CdoSequence * seq, uint32_t nodeid, uint32_t latency); +void cdocmd_add_pm_reset_assert(CdoSequence * seq, uint32_t nodeid, uint32_t action); +void cdocmd_add_pm_reset_get_status(CdoSequence * seq, uint32_t nodeid); +void cdocmd_add_pm_pinctrl_request(CdoSequence * seq, uint32_t pinid); +void cdocmd_add_pm_pinctrl_release(CdoSequence * seq, uint32_t pinid); +void cdocmd_add_pm_pinctrl_get_function(CdoSequence * seq, uint32_t pinid); +void cdocmd_add_pm_pinctrl_set_function(CdoSequence * seq, uint32_t pinid, uint32_t funcid); +void cdocmd_add_pm_pinctrl_config_param_get(CdoSequence * seq, uint32_t pinid, uint32_t param); +void cdocmd_add_pm_pinctrl_config_param_set(CdoSequence * seq, uint32_t pinid, uint32_t param, uint32_t value); +void cdocmd_add_pm_ioctl(CdoSequence * seq, uint32_t nodeid, uint32_t ioctlid, void * buf, uint32_t count, uint32_t be); +void cdocmd_add_pm_query_data(CdoSequence * seq, uint32_t id, void * buf, uint32_t count, uint32_t be); +void cdocmd_add_pm_clock_enable(CdoSequence * seq, uint32_t nodeid); +void cdocmd_add_pm_clock_disable(CdoSequence * seq, uint32_t nodeid); +void cdocmd_add_pm_clock_getstate(CdoSequence * seq, uint32_t nodeid); +void cdocmd_add_pm_clock_setdivider(CdoSequence * seq, uint32_t nodeid, uint32_t div); +void cdocmd_add_pm_clock_getdivider(CdoSequence * seq, uint32_t nodeid); +void cdocmd_add_pm_clock_setrate(CdoSequence * seq, uint32_t nodeid, uint32_t rate); +void cdocmd_add_pm_clock_getrate(CdoSequence * seq, uint32_t nodeid); +void cdocmd_add_pm_clock_setparent(CdoSequence * seq, uint32_t nodeid, uint32_t parentid); +void cdocmd_add_pm_clock_getparent(CdoSequence * seq, uint32_t nodeid); +void cdocmd_add_pm_pll_set_parameter(CdoSequence * seq, uint32_t nodeid, uint32_t param, uint32_t value); +void cdocmd_add_pm_pll_get_parameter(CdoSequence * seq, uint32_t nodeid, uint32_t param); +void cdocmd_add_pm_pll_set_mode(CdoSequence * seq, uint32_t nodeid, uint32_t val); +void cdocmd_add_pm_pll_get_mode(CdoSequence * seq, uint32_t nodeid); +void cdocmd_add_pm_add_subsystem(CdoSequence * seq, uint32_t ssid); +void cdocmd_add_pm_destroy_subsystem(CdoSequence * seq, uint32_t ssid); +void cdocmd_add_pm_describe_nodes(CdoSequence * seq, void * buf, uint32_t count, uint32_t be); +void cdocmd_add_pm_add_node(CdoSequence * seq, uint32_t nodeid, uint32_t count, void * buf, uint32_t be); +void cdocmd_add_pm_add_node_parent(CdoSequence * seq, uint32_t nodeid, uint32_t count, void * buf, uint32_t be); +void cdocmd_add_pm_add_node_name(CdoSequence * seq, uint32_t nodeid, const char * name); +void cdocmd_add_pm_add_requirement(CdoSequence * seq, uint32_t ssid, uint32_t nodeid, uint32_t flags, uint32_t count, void * buf, uint32_t be); +void cdocmd_add_pm_set_current_subsystem(CdoSequence * seq, uint32_t ssid); +void cdocmd_add_pm_init_node(CdoSequence * seq, uint32_t nodeid, uint32_t function, uint32_t count, void * buf, uint32_t be); +void cdocmd_add_pm_feature_check(CdoSequence * seq, uint32_t id); +void cdocmd_add_pm_iso_control(CdoSequence * seq, uint32_t nodeid, uint32_t value); +void cdocmd_add_pm_activate_subsystem(CdoSequence * seq, uint32_t ssid); +void cdocmd_add_pm_set_node_access(CdoSequence * seq, uint32_t nodeid, uint32_t count, void * buf, uint32_t be); + +void cdocmd_add_cfu_set_crc32(CdoSequence * seq, uint32_t type, uint32_t value); +void cdocmd_add_cfu_decompress(CdoSequence * seq, uint32_t type); +void cdocmd_add_cfu_cram_rw(CdoSequence * seq, uint32_t value); +void cdocmd_add_cfu_seu_go(CdoSequence * seq, uint32_t value); +void cdocmd_add_cfu_crc8_dis(CdoSequence * seq, uint32_t type); +void cdocmd_add_cfu_ssi_per_slr_pr(CdoSequence * seq, uint32_t value); +void cdocmd_add_cfu_gsr_gsc(CdoSequence * seq, uint32_t value); +void cdocmd_add_cfu_gcap_clk_en(CdoSequence * seq, uint32_t value); +void cdocmd_add_cfu_cfi_type(CdoSequence * seq, uint32_t value); +void cdocmd_add_cframe_read(CdoSequence * seq, uint32_t param, uint64_t addr, uint32_t read_count, uint32_t count, void * buf, uint32_t be); +void cdocmd_add_ssit_sync_master(CdoSequence * seq); +void cdocmd_add_ssit_sync_slaves(CdoSequence * seq, uint32_t mask, uint32_t count); +void cdocmd_add_ssit_wait_slaves(CdoSequence * seq, uint32_t mask, uint32_t count); +void cdocmd_add_nop(CdoSequence * seq, uint32_t count, void * buf, uint32_t be); +void cdocmd_add_event_logging(CdoSequence * seq, uint32_t subcmd, uint32_t count, void * buf, uint32_t be); +void cdocmd_add_set_board(CdoSequence * seq, const char * name); +void cdocmd_add_set_plm_wdt(CdoSequence * seq, uint32_t nodeid, uint32_t periodicity); +void cdocmd_add_log_string(CdoSequence * seq, const char * str); +void cdocmd_add_log_address(CdoSequence * seq, uint64_t srcaddr); +void cdocmd_add_marker(CdoSequence * seq, uint32_t value, const char * str); +void cdocmd_add_proc(CdoSequence * seq, uint32_t value); +void cdocmd_add_begin(CdoSequence * seq, const char * str); +void cdocmd_add_end(CdoSequence * seq); +void cdocmd_add_break(CdoSequence * seq, uint32_t value); +void cdocmd_add_ot_check(CdoSequence * seq, uint32_t value); +void cdocmd_add_psm_sequence(CdoSequence * seq); +void cdocmd_add_ldr_set_image_info(CdoSequence * seq, uint32_t nodeid, uint32_t uid, uint32_t puid, uint32_t funcid); +void cdocmd_add_em_set_action(CdoSequence * seq, uint32_t nodeid, uint32_t action, uint32_t mask); +void cdocmd_insert_seq(CdoCommand * cmd, CdoSequence * seq); +void cdocmd_concat_seq(CdoSequence * seq, CdoSequence * seq2); + +void cdocmd_rewrite_address(CdoSequence * seq); +void cdocmd_rewrite_block(CdoSequence * seq); +void cdocmd_rewrite_sequential(CdoSequence * seq); +void cdocmd_rewrite_repeat(CdoSequence * seq); +void cdocmd_remove_comments(CdoSequence * seq); static inline uint16_t u16swap(uint16_t v) { return ((v >> 8) & 0xff) | ((v << 8) & 0xff00); diff -Nru xilinx-bootgen-2021.2/cdo-load.h xilinx-bootgen-2022.1/cdo-load.h --- xilinx-bootgen-2021.2/cdo-load.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/cdo-load.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2019-2021 Xilinx, Inc. +* Copyright 2019-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,9 @@ #include #include "cdo-command.h" -CDOUTIL_EXPORT void * file_to_buf(const char * path, size_t * sizep); -CDOUTIL_EXPORT CdoSequence * cdoseq_load_cdo(const char * path); +void * file_to_buf(const char * path, size_t * sizep); +CdoSequence * cdoseq_load_cdo(const char * path); -CDOUTIL_EXPORT void cdoseq_extract_writes(CdoSequence * seq); -CDOUTIL_EXPORT CdoSequence* cdoseq_extract_cdo_till_ssit_sync_slaves(CdoSequence * seq, uint32_t sync_index); +void cdoseq_extract_writes(CdoSequence * seq); +CdoSequence* cdoseq_extract_cdo_till_ssit_sync_slaves(CdoSequence * seq, uint32_t sync_index); #endif /* D_cdo_load */ diff -Nru xilinx-bootgen-2021.2/cdo-npi.h xilinx-bootgen-2022.1/cdo-npi.h --- xilinx-bootgen-2021.2/cdo-npi.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/cdo-npi.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2019-2020 Xilinx, Inc. +* Copyright 2019-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,11 +19,26 @@ #include "cdo-command.h" -CDOUTIL_EXPORT int cdocmd_post_process_mode(const char * s, uint32_t verbose); -CDOUTIL_EXPORT void cdocmd_post_process_start(void); -CDOUTIL_EXPORT uint32_t cdocmd_post_process_end_seq(CdoSequence ** seqp); -CDOUTIL_EXPORT void cdocmd_post_process_end(void ** new_data, size_t * new_size); -CDOUTIL_EXPORT uint32_t cdocmd_post_process_cdo_seq(const void * data, size_t size, CdoSequence ** seqp); -CDOUTIL_EXPORT uint32_t cdocmd_post_process_cdo(const void * data, size_t size, void ** new_data, size_t * new_size); +enum { + houseclean_bypass_lpd = 1, + houseclean_bypass_fpd = 2, + houseclean_bypass_npd = 4, + houseclean_bypass_plpd = 8, + houseclean_bypass_cpm = 16, +}; + +int is_platform_spp(void); +int cdocmd_post_process_mode(const char * s, uint32_t verbose); +void set_cfu_stream_keyhole_size(uint64_t size); +void set_platform_spp(void); +void set_spp_ddr_enable(uint32_t enable); +void cdocmd_post_process_start(void); +uint32_t cdocmd_post_process_end_seq(CdoSequence ** seqp); +void cdocmd_post_process_end(void ** new_data, size_t * new_size); +uint32_t cdocmd_post_process_cdo_seq(const void * data, size_t size, CdoSequence ** seqp); +uint32_t cdocmd_post_process_cfi_seq(const void * data, size_t size, uint32_t is_gsc, CdoSequence ** seqp); +uint32_t cdocmd_post_process_cdo(const void * data, size_t size, void ** new_data, size_t * new_size); +uint32_t cdocmd_post_process_cfi(const void * data, size_t size, uint32_t is_gsc, void ** new_data, size_t * new_size); +void cdocmd_rewrite_address_filter(CdoSequence * seq, const char * address_filter_file); #endif /* D_cdo_npi */ diff -Nru xilinx-bootgen-2021.2/cdo-overlay.c xilinx-bootgen-2022.1/cdo-overlay.c --- xilinx-bootgen-2021.2/cdo-overlay.c 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/cdo-overlay.c 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2019-2021 Xilinx, Inc. +* Copyright 2019-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -120,7 +120,6 @@ CdoCommand * ovlcmd = NULL; if (dstentry->level != level) continue; more = 1; - fprintf(stdout, "check overlay \"%s\"\n", (char *)dstentry->start->buf); ovlentry = find_last_entry(ovl, dstentry->start->buf, 0); if (ovlentry == NULL) continue; diff -Nru xilinx-bootgen-2021.2/cdo-overlay.h xilinx-bootgen-2022.1/cdo-overlay.h --- xilinx-bootgen-2021.2/cdo-overlay.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/cdo-overlay.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2019-2021 Xilinx, Inc. +* Copyright 2019-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff -Nru xilinx-bootgen-2021.2/cdo-raw.h xilinx-bootgen-2022.1/cdo-raw.h --- xilinx-bootgen-2021.2/cdo-raw.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/cdo-raw.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2019-2020 Xilinx, Inc. +* Copyright 2019-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,8 +17,6 @@ #ifndef D_cdo_raw #define D_cdo_raw -#include "dyn_link.h" - typedef struct CdoRawInfo CdoRawInfo; typedef enum { @@ -33,7 +31,7 @@ uint32_t data[1]; /* Must be last */ }; -CDOUTIL_EXPORT CdoRawInfo * decode_raw(void * data, size_t size); -CDOUTIL_EXPORT void encode_raw(FILE * f, void * data, size_t size); +CdoRawInfo * decode_raw(void * data, size_t size); +void encode_raw(FILE * f, void * data, size_t size); #endif /* D_cdo_raw */ diff -Nru xilinx-bootgen-2021.2/cdo-source.c xilinx-bootgen-2022.1/cdo-source.c --- xilinx-bootgen-2021.2/cdo-source.c 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/cdo-source.c 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2019-2021 Xilinx, Inc. +* Copyright 2019-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -71,6 +71,8 @@ { "begin", CdoCmdBegin }, { "end", CdoCmdEnd }, { "break", CdoCmdBreak }, + { "ot_check", CdoCmdOtCheck }, + { "psm_sequence", CdoCmdPsmSequence }, { "npi_seq", CdoCmdNpiSeq }, { "npi_precfg", CdoCmdNpiPreCfg }, { "npi_write", CdoCmdNpiWrite }, @@ -123,6 +125,8 @@ { "pm_init_node", CdoCmdPmInitNode }, { "pm_feature_check", CdoCmdPmFeatureCheck }, { "pm_iso_control", CdoCmdPmIsoControl }, + { "pm_activate_subsystem", CdoCmdPmActivateSubsystem }, + { "pm_set_node_access", CdoCmdPmSetNodeAccess }, { "cfu_set_crc32", CdoCmdCfuSetCrc32 }, { "cfu_decompress", CdoCmdCfuDecompress }, { "cfu_cram_rw", CdoCmdCfuCramRW }, @@ -277,7 +281,7 @@ if (*s == '#') { s++; skipsp(s); - cdocmd_add_comment(seq, s); + cdocmd_add_comment(seq, "%s", s); } continue; } @@ -557,6 +561,17 @@ cdocmd_add_break(seq, value); break; } + case CdoCmdOtCheck: { + uint32_t value; + skipsp(s); + if (parse_u32(&s, &value)) goto syntax_error; + cdocmd_add_ot_check(seq, value); + break; + } + case CdoCmdPsmSequence: + cdocmd_add_psm_sequence(seq); + level++; + break; case CdoCmdNpiSeq: case CdoCmdNpiPreCfg: case CdoCmdNpiShutdown: { @@ -981,6 +996,22 @@ cdocmd_add_pm_iso_control(seq, nodeid, value); break; } + case CdoCmdPmActivateSubsystem: { + uint32_t id; + if (parse_u32(&s, &id)) goto syntax_error; + cdocmd_add_pm_activate_subsystem(seq, id); + break; + } + case CdoCmdPmSetNodeAccess: { + uint32_t id; + uint32_t count; + uint32_t * buf; + if (parse_u32(&s, &id)) goto syntax_error; + if (parse_buf(&s, &buf, &count)) goto syntax_error; + cdocmd_add_pm_set_node_access(seq, id, count, buf, is_be_host()); + free(buf); + break; + } case CdoCmdCfuSetCrc32: { uint32_t flags; uint32_t value; @@ -1308,6 +1339,16 @@ } fprintf(f, "\n"); break; + case CdoCmdOtCheck: + fprintf(f, "ot_check"); + fprintf(f, " "); + print_x64(f, cmd->value); + fprintf(f, "\n"); + break; + case CdoCmdPsmSequence: + fprintf(f, "psm_sequence\n"); + level++; + break; case CdoCmdNpiSeq: fprintf(f, "npi_seq "); print_x64(f, cmd->dstaddr); @@ -1664,6 +1705,17 @@ print_x64(f, cmd->value); fprintf(f, "\n"); break; + case CdoCmdPmActivateSubsystem: + fprintf(f, "pm_activate_subsystem "); + print_x64(f, cmd->id); + fprintf(f, "\n"); + break; + case CdoCmdPmSetNodeAccess: + fprintf(f, "pm_set_node_access "); + print_x64(f, cmd->id); + print_buf(f, cmd->buf, cmd->count); + fprintf(f, "\n"); + break; case CdoCmdCfuSetCrc32: fprintf(f, "cfu_set_crc32 "); print_x64(f, cmd->flags); diff -Nru xilinx-bootgen-2021.2/cdo-source.h xilinx-bootgen-2022.1/cdo-source.h --- xilinx-bootgen-2021.2/cdo-source.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/cdo-source.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2019-2020 Xilinx, Inc. +* Copyright 2019-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ #include #include "cdo-command.h" -CDOUTIL_EXPORT CdoSequence * cdoseq_from_source(FILE * f); -CDOUTIL_EXPORT void cdoseq_to_source(FILE * f, CdoSequence * seq); +CdoSequence * cdoseq_from_source(FILE * f); +void cdoseq_to_source(FILE * f, CdoSequence * seq); #endif /* D_cdo_source */ diff -Nru xilinx-bootgen-2021.2/cmdoptions.l xilinx-bootgen-2022.1/cmdoptions.l --- xilinx-bootgen-2021.2/cmdoptions.l 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/cmdoptions.l 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2020 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -167,6 +167,7 @@ read return tok::HREAD; dump return tok::HDUMP; dump_dir return tok::HDUMPDIR; +overlay_cdo return tok::HOVLCDO; aarch32_mode return tok::H_BIF_AARCH32; big_endian return tok::H_BIF_BIGENDIAN; diff -Nru xilinx-bootgen-2021.2/cmdoptions.tab.cpp xilinx-bootgen-2022.1/cmdoptions.tab.cpp --- xilinx-bootgen-2021.2/cmdoptions.tab.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/cmdoptions.tab.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -760,392 +760,392 @@ case 80: /* Line 670 of lalr1.cc */ -#line 197 "../../s/cmdoptions.y" - { ShowBifHelp(0); exit(0); } +#line 195 "../../s/cmdoptions.y" + { ShowCmdHelp(CO::BisonParser::token::HOVLCDO); exit(0); } break; case 81: /* Line 670 of lalr1.cc */ #line 198 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_INIT); exit(0); } + { ShowBifHelp(0); exit(0); } break; case 82: /* Line 670 of lalr1.cc */ #line 199 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_UDFBH); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_INIT); exit(0); } break; case 83: /* Line 670 of lalr1.cc */ #line 200 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_AES); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_UDFBH); exit(0); } break; case 84: /* Line 670 of lalr1.cc */ #line 201 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_PPK); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_AES); exit(0); } break; case 85: /* Line 670 of lalr1.cc */ #line 202 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_PSK); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_PPK); exit(0); } break; case 86: /* Line 670 of lalr1.cc */ #line 203 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_SPK); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_PSK); exit(0); } break; case 87: /* Line 670 of lalr1.cc */ #line 204 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_SSK); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_SPK); exit(0); } break; case 88: /* Line 670 of lalr1.cc */ #line 205 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_SPKSIGN); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_SSK); exit(0); } break; case 89: /* Line 670 of lalr1.cc */ #line 206 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_HDRSIGN); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_SPKSIGN); exit(0); } break; case 90: /* Line 670 of lalr1.cc */ #line 207 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_BOOTIMAGE); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_HDRSIGN); exit(0); } break; case 91: /* Line 670 of lalr1.cc */ #line 208 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_BL); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_BOOTIMAGE); exit(0); } break; case 92: /* Line 670 of lalr1.cc */ #line 209 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_ENCR); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_BL); exit(0); } break; case 93: /* Line 670 of lalr1.cc */ #line 210 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_PID); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_ENCR); exit(0); } break; case 94: /* Line 670 of lalr1.cc */ #line 211 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_AUTH); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_PID); exit(0); } break; case 95: /* Line 670 of lalr1.cc */ #line 212 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_CHKSM); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_AUTH); exit(0); } break; case 96: /* Line 670 of lalr1.cc */ #line 213 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_POWNER); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_CHKSM); exit(0); } break; case 97: /* Line 670 of lalr1.cc */ #line 214 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_PRESIGN); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_POWNER); exit(0); } break; case 98: /* Line 670 of lalr1.cc */ #line 215 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_UDF); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_PRESIGN); exit(0); } break; case 99: /* Line 670 of lalr1.cc */ #line 216 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_XIP); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_UDF); exit(0); } break; case 100: /* Line 670 of lalr1.cc */ #line 217 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_ALIGN); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_XIP); exit(0); } break; case 101: /* Line 670 of lalr1.cc */ #line 218 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_OFFSET); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_ALIGN); exit(0); } break; case 102: /* Line 670 of lalr1.cc */ #line 219 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_RES); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_OFFSET); exit(0); } break; case 103: /* Line 670 of lalr1.cc */ #line 220 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_LOAD); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_RES); exit(0); } break; case 104: /* Line 670 of lalr1.cc */ #line 221 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_STARTUP); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_LOAD); exit(0); } break; case 105: /* Line 670 of lalr1.cc */ #line 222 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_KEYSRC); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_STARTUP); exit(0); } break; case 106: /* Line 670 of lalr1.cc */ #line 223 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_FSBLCFG); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_KEYSRC); exit(0); } break; case 107: /* Line 670 of lalr1.cc */ #line 224 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_BOOTDEV); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_FSBLCFG); exit(0); } break; case 108: /* Line 670 of lalr1.cc */ #line 225 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_DESTCPU); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_BOOTDEV); exit(0); } break; case 109: /* Line 670 of lalr1.cc */ #line 226 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_DESTDEV); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_DESTCPU); exit(0); } break; case 110: /* Line 670 of lalr1.cc */ #line 227 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_EL); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_DESTDEV); exit(0); } break; case 111: /* Line 670 of lalr1.cc */ #line 228 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_TZ); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_EL); exit(0); } break; case 112: /* Line 670 of lalr1.cc */ #line 229 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_AUTHPARAM); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_TZ); exit(0); } break; case 113: /* Line 670 of lalr1.cc */ #line 230 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_BHKEY); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_AUTHPARAM); exit(0); } break; case 114: /* Line 670 of lalr1.cc */ #line 231 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_PFW); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_BHKEY); exit(0); } break; case 115: /* Line 670 of lalr1.cc */ #line 232 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_BLOCKS); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_PFW); exit(0); } break; case 116: /* Line 670 of lalr1.cc */ #line 233 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_BHIV); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_BLOCKS); exit(0); } break; case 117: /* Line 670 of lalr1.cc */ #line 234 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_METAL); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_BHIV); exit(0); } break; case 118: /* Line 670 of lalr1.cc */ #line 235 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_ELYHNDOFF); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_METAL); exit(0); } break; case 119: /* Line 670 of lalr1.cc */ #line 236 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_HIVEC); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_ELYHNDOFF); exit(0); } break; case 120: /* Line 670 of lalr1.cc */ #line 237 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_BHSIGN); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_HIVEC); exit(0); } break; case 121: /* Line 670 of lalr1.cc */ #line 238 "../../s/cmdoptions.y" - { ShowCommonHelp(CO::BisonParser::token::H_SPLIT,false); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_BHSIGN); exit(0); } break; case 122: /* Line 670 of lalr1.cc */ #line 239 "../../s/cmdoptions.y" - { ShowCommonHelp(CO::BisonParser::token::H_SPKSIGN,false); exit(0); } + { ShowCommonHelp(CO::BisonParser::token::H_SPLIT,false); exit(0); } break; case 123: /* Line 670 of lalr1.cc */ #line 240 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_BOOTVEC); exit(0); } + { ShowCommonHelp(CO::BisonParser::token::H_SPKSIGN,false); exit(0); } break; case 124: /* Line 670 of lalr1.cc */ #line 241 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_PUFDATA); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_BOOTVEC); exit(0); } break; case 125: /* Line 670 of lalr1.cc */ #line 242 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_AARCH32); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_PUFDATA); exit(0); } break; case 126: /* Line 670 of lalr1.cc */ #line 243 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_BIGENDIAN); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_AARCH32); exit(0); } break; case 127: /* Line 670 of lalr1.cc */ #line 244 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_BOOTCONFIG); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_BIGENDIAN); exit(0); } break; case 128: /* Line 670 of lalr1.cc */ #line 245 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_COPY); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_BOOTCONFIG); exit(0); } break; case 129: /* Line 670 of lalr1.cc */ #line 246 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_CORE); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_COPY); exit(0); } break; case 130: /* Line 670 of lalr1.cc */ #line 247 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_DELAY_HANDOFF); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_CORE); exit(0); } break; case 131: /* Line 670 of lalr1.cc */ #line 248 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_DELAY_LOAD); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_DELAY_HANDOFF); exit(0); } break; case 132: /* Line 670 of lalr1.cc */ #line 249 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_FILE); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_DELAY_LOAD); exit(0); } break; case 133: /* Line 670 of lalr1.cc */ #line 250 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_ID); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_FILE); exit(0); } break; case 134: /* Line 670 of lalr1.cc */ #line 251 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_IMAGE); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_ID); exit(0); } break; case 135: /* Line 670 of lalr1.cc */ #line 252 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_METAHDR); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_IMAGE); exit(0); } break; case 136: /* Line 670 of lalr1.cc */ #line 253 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_NAME); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_METAHDR); exit(0); } break; case 137: /* Line 670 of lalr1.cc */ #line 254 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_PARENTID); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_NAME); exit(0); } break; case 138: /* Line 670 of lalr1.cc */ #line 255 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_PARTITION); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_PARENTID); exit(0); } break; case 139: /* Line 670 of lalr1.cc */ #line 256 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_SLR); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_PARTITION); exit(0); } break; case 140: /* Line 670 of lalr1.cc */ #line 257 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_TYPE); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_SLR); exit(0); } break; case 141: /* Line 670 of lalr1.cc */ #line 258 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_KEYSRCENCR); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_TYPE); exit(0); } break; case 142: /* Line 670 of lalr1.cc */ #line 259 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_DPACM_ENABLE); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_BIF_KEYSRCENCR); exit(0); } break; case 143: /* Line 670 of lalr1.cc */ #line 260 "../../s/cmdoptions.y" - { ShowBifHelp(CO::BisonParser::token::H_BIF_USERKEYS); exit(0); } + { ShowBifHelp(CO::BisonParser::token::H_DPACM_ENABLE); exit(0); } break; case 144: /* Line 670 of lalr1.cc */ -#line 263 "../../s/cmdoptions.y" - { options.SetOverwrite(true); } +#line 261 "../../s/cmdoptions.y" + { ShowBifHelp(CO::BisonParser::token::H_BIF_USERKEYS); exit(0); } break; case 145: @@ -1157,360 +1157,366 @@ case 146: /* Line 670 of lalr1.cc */ #line 265 "../../s/cmdoptions.y" - { options.SetOverwrite(false); } + { options.SetOverwrite(true); } break; - case 148: + case 147: /* Line 670 of lalr1.cc */ -#line 269 "../../s/cmdoptions.y" - { options.SetLogLevel(LogLevel::ERROR); } +#line 266 "../../s/cmdoptions.y" + { options.SetOverwrite(false); } break; case 149: /* Line 670 of lalr1.cc */ #line 270 "../../s/cmdoptions.y" - { options.SetLogLevel(LogLevel::WARNING); } + { options.SetLogLevel(LogLevel::ERROR); } break; case 150: /* Line 670 of lalr1.cc */ #line 271 "../../s/cmdoptions.y" - { options.SetLogLevel(LogLevel::INFO); } + { options.SetLogLevel(LogLevel::WARNING); } break; case 151: /* Line 670 of lalr1.cc */ #line 272 "../../s/cmdoptions.y" - { options.SetLogLevel(LogLevel::DEBUG); } + { options.SetLogLevel(LogLevel::INFO); } break; case 152: /* Line 670 of lalr1.cc */ #line 273 "../../s/cmdoptions.y" - { options.SetLogLevel(LogLevel::TRACE); } + { options.SetLogLevel(LogLevel::DEBUG); } break; case 153: /* Line 670 of lalr1.cc */ -#line 276 "../../s/cmdoptions.y" - { options.SetEncryptedKeySource(KeySource::BbramRedKey); } +#line 274 "../../s/cmdoptions.y" + { options.SetLogLevel(LogLevel::TRACE); } break; case 154: /* Line 670 of lalr1.cc */ #line 277 "../../s/cmdoptions.y" - { options.SetEncryptedKeySource(KeySource::EfuseRedKey); } + { options.SetEncryptedKeySource(KeySource::BbramRedKey); } break; - case 156: + case 155: /* Line 670 of lalr1.cc */ -#line 280 "../../s/cmdoptions.y" - { options.SetStartCbc((yysemantic_stack_[(3) - (3)].cstring));} +#line 278 "../../s/cmdoptions.y" + { options.SetEncryptedKeySource(KeySource::EfuseRedKey); } break; - case 158: + case 157: /* Line 670 of lalr1.cc */ #line 281 "../../s/cmdoptions.y" - { options.SetKey0((yysemantic_stack_[(3) - (3)].cstring));} + { options.SetStartCbc((yysemantic_stack_[(3) - (3)].cstring));} break; - case 160: + case 159: /* Line 670 of lalr1.cc */ #line 282 "../../s/cmdoptions.y" - { options.SetHmac((yysemantic_stack_[(3) - (3)].cstring));} + { options.SetKey0((yysemantic_stack_[(3) - (3)].cstring));} break; - case 162: + case 161: /* Line 670 of lalr1.cc */ #line 283 "../../s/cmdoptions.y" - { options.SetEncryptionKeyFile((yysemantic_stack_[(1) - (1)].cstring));} + { options.SetHmac((yysemantic_stack_[(3) - (3)].cstring));} break; - case 164: + case 163: /* Line 670 of lalr1.cc */ -#line 287 "../../s/cmdoptions.y" - { options.SetProcessBitstreamType(File::MCS); } +#line 284 "../../s/cmdoptions.y" + { options.SetEncryptionKeyFile((yysemantic_stack_[(1) - (1)].cstring));} break; case 165: /* Line 670 of lalr1.cc */ #line 288 "../../s/cmdoptions.y" - { options.SetProcessBitstreamType(File::BIN); } + { options.SetProcessBitstreamType(File::MCS); } break; case 166: /* Line 670 of lalr1.cc */ -#line 291 "../../s/cmdoptions.y" - { options.SetDualQspiMode(QspiMode::PARALLEL_LQSPI); } +#line 289 "../../s/cmdoptions.y" + { options.SetProcessBitstreamType(File::BIN); } break; case 167: /* Line 670 of lalr1.cc */ #line 292 "../../s/cmdoptions.y" - { options.SetDualQspiMode(QspiMode::STACKED); } + { options.SetDualQspiMode(QspiMode::PARALLEL_LQSPI); } break; case 168: /* Line 670 of lalr1.cc */ -#line 295 "../../s/cmdoptions.y" - { LOG_ERROR("'parallel' option is not supported with '-dual_ospi_mode'."); } +#line 293 "../../s/cmdoptions.y" + { options.SetDualQspiMode(QspiMode::STACKED); } break; case 169: /* Line 670 of lalr1.cc */ #line 296 "../../s/cmdoptions.y" - { options.SetDualQspiMode(QspiMode::STACKED); } + { LOG_ERROR("'parallel' option is not supported with '-dual_ospi_mode'."); } break; case 170: /* Line 670 of lalr1.cc */ -#line 299 "../../s/cmdoptions.y" - { options.SetQspiSize((uint16_t)(yysemantic_stack_[(1) - (1)].number)); } +#line 297 "../../s/cmdoptions.y" + { options.SetDualQspiMode(QspiMode::STACKED); } break; case 171: /* Line 670 of lalr1.cc */ #line 300 "../../s/cmdoptions.y" - { options.SetQspiSize((uint16_t)atoi((yysemantic_stack_[(1) - (1)].cstring))); } + { options.SetQspiSize((uint16_t)(yysemantic_stack_[(1) - (1)].number)); } break; case 172: /* Line 670 of lalr1.cc */ -#line 303 "../../s/cmdoptions.y" - { options.SetOspiSize((uint16_t)(yysemantic_stack_[(1) - (1)].number)); } +#line 301 "../../s/cmdoptions.y" + { options.SetQspiSize((uint16_t)atoi((yysemantic_stack_[(1) - (1)].cstring))); } break; case 173: /* Line 670 of lalr1.cc */ #line 304 "../../s/cmdoptions.y" - { options.SetOspiSize((uint16_t)atoi((yysemantic_stack_[(1) - (1)].cstring))); } + { options.SetOspiSize((uint16_t)(yysemantic_stack_[(1) - (1)].number)); } break; case 174: /* Line 670 of lalr1.cc */ -#line 307 "../../s/cmdoptions.y" - { options.SetArchType(Arch::ZYNQ); } +#line 305 "../../s/cmdoptions.y" + { options.SetOspiSize((uint16_t)atoi((yysemantic_stack_[(1) - (1)].cstring))); } break; case 175: /* Line 670 of lalr1.cc */ #line 308 "../../s/cmdoptions.y" - { options.SetArchType(Arch::ZYNQMP); } + { options.SetArchType(Arch::ZYNQ); } break; case 176: /* Line 670 of lalr1.cc */ #line 309 "../../s/cmdoptions.y" - { options.SetArchType(Arch::VERSAL); } + { options.SetArchType(Arch::ZYNQMP); } break; case 177: /* Line 670 of lalr1.cc */ #line 310 "../../s/cmdoptions.y" - { options.SetArchType(Arch::FPGA); } + { options.SetArchType(Arch::VERSAL); } break; - case 179: + case 178: /* Line 670 of lalr1.cc */ -#line 314 "../../s/cmdoptions.y" - { options.SetGreyKeyGeneration(true); } +#line 311 "../../s/cmdoptions.y" + { options.SetArchType(Arch::FPGA); } break; case 180: /* Line 670 of lalr1.cc */ #line 315 "../../s/cmdoptions.y" - { options.SetMetalKeyGeneration(true); } + { options.SetGreyKeyGeneration(true); } break; case 181: /* Line 670 of lalr1.cc */ #line 316 "../../s/cmdoptions.y" - { options.SetAuthKeyGeneration(GenAuthKeys::PEM); } + { options.SetMetalKeyGeneration(true); } break; case 182: /* Line 670 of lalr1.cc */ #line 317 "../../s/cmdoptions.y" - { options.SetAuthKeyGeneration(GenAuthKeys::RSA); } + { options.SetAuthKeyGeneration(GenAuthKeys::PEM); } break; case 183: /* Line 670 of lalr1.cc */ #line 318 "../../s/cmdoptions.y" - { options.SetAuthKeyGeneration(GenAuthKeys::ECDSA); } + { options.SetAuthKeyGeneration(GenAuthKeys::RSA); } break; case 184: /* Line 670 of lalr1.cc */ #line 319 "../../s/cmdoptions.y" - { options.SetAuthKeyGeneration(GenAuthKeys::ECDSAP521); } + { options.SetAuthKeyGeneration(GenAuthKeys::ECDSA); } break; case 185: /* Line 670 of lalr1.cc */ -#line 322 "../../s/cmdoptions.y" - { options.SetAuthKeyGeneration(GenAuthKeys::PEM); } +#line 320 "../../s/cmdoptions.y" + { options.SetAuthKeyGeneration(GenAuthKeys::ECDSAP521); } break; case 186: /* Line 670 of lalr1.cc */ #line 323 "../../s/cmdoptions.y" - { options.SetAuthKeyGeneration(GenAuthKeys::RSA); } + { options.SetAuthKeyGeneration(GenAuthKeys::PEM); } break; case 187: /* Line 670 of lalr1.cc */ -#line 326 "../../s/cmdoptions.y" +#line 324 "../../s/cmdoptions.y" + { options.SetAuthKeyGeneration(GenAuthKeys::RSA); } + break; + + case 188: +/* Line 670 of lalr1.cc */ +#line 327 "../../s/cmdoptions.y" { options.SetSecureDebugAuthType(Authentication::ECDSA); options.SetSecureDebugImageFile("secureDebugImage-ecdsa.bin"); } break; - case 188: + case 189: /* Line 670 of lalr1.cc */ -#line 328 "../../s/cmdoptions.y" +#line 329 "../../s/cmdoptions.y" { options.SetSecureDebugAuthType(Authentication::RSA); options.SetSecureDebugImageFile("secureDebugImage-rsa.bin"); } break; - case 189: + case 190: /* Line 670 of lalr1.cc */ -#line 331 "../../s/cmdoptions.y" +#line 332 "../../s/cmdoptions.y" { options.SetSecureDebugImageFile((yysemantic_stack_[(2) - (2)].cstring)); } break; - case 191: + case 192: /* Line 670 of lalr1.cc */ -#line 334 "../../s/cmdoptions.y" +#line 335 "../../s/cmdoptions.y" { options.SetSecureDebugAuthType(Authentication::ECDSA); options.SetSecureDebugImageFile("authenticatedJtagImage-ecdsa.bin"); } break; - case 192: + case 193: /* Line 670 of lalr1.cc */ -#line 336 "../../s/cmdoptions.y" +#line 337 "../../s/cmdoptions.y" { options.SetSecureDebugAuthType(Authentication::RSA); options.SetSecureDebugImageFile("authenticatedJtagImage-rsa.bin"); } break; - case 193: + case 194: /* Line 670 of lalr1.cc */ -#line 340 "../../s/cmdoptions.y" +#line 341 "../../s/cmdoptions.y" { options.SetReadImageFile((yysemantic_stack_[(1) - (1)].cstring)); options.SetVerifyImageOption(true); } break; - case 194: + case 195: /* Line 670 of lalr1.cc */ -#line 343 "../../s/cmdoptions.y" +#line 344 "../../s/cmdoptions.y" { options.SetReadImageFile((yysemantic_stack_[(1) - (1)].cstring)); options.SetReadImageOption(ReadImageOption::ALL); } break; - case 195: -/* Line 670 of lalr1.cc */ -#line 345 "../../s/cmdoptions.y" - { options.SetReadImageFile((yysemantic_stack_[(2) - (1)].cstring)); } - break; - case 196: /* Line 670 of lalr1.cc */ -#line 348 "../../s/cmdoptions.y" - { options.SetReadImageOption(ReadImageOption::BH); } +#line 346 "../../s/cmdoptions.y" + { options.SetReadImageFile((yysemantic_stack_[(2) - (1)].cstring)); } break; case 197: /* Line 670 of lalr1.cc */ #line 349 "../../s/cmdoptions.y" - { options.SetReadImageOption(ReadImageOption::IHT); } + { options.SetReadImageOption(ReadImageOption::BH); } break; case 198: /* Line 670 of lalr1.cc */ #line 350 "../../s/cmdoptions.y" - { options.SetReadImageOption(ReadImageOption::IH); } + { options.SetReadImageOption(ReadImageOption::IHT); } break; case 199: /* Line 670 of lalr1.cc */ #line 351 "../../s/cmdoptions.y" - { options.SetReadImageOption(ReadImageOption::PHT); } + { options.SetReadImageOption(ReadImageOption::IH); } break; case 200: /* Line 670 of lalr1.cc */ #line 352 "../../s/cmdoptions.y" - { options.SetReadImageOption(ReadImageOption::AC); } + { options.SetReadImageOption(ReadImageOption::PHT); } break; case 201: /* Line 670 of lalr1.cc */ -#line 355 "../../s/cmdoptions.y" - { options.SetDumpOption(DumpOption::BH); } +#line 353 "../../s/cmdoptions.y" + { options.SetReadImageOption(ReadImageOption::AC); } break; case 202: /* Line 670 of lalr1.cc */ #line 356 "../../s/cmdoptions.y" + { options.SetDumpOption(DumpOption::BH); } + break; + + case 203: +/* Line 670 of lalr1.cc */ +#line 357 "../../s/cmdoptions.y" { options.SetReadImageFile((yysemantic_stack_[(2) - (1)].cstring)); options.SetDumpOption(DumpOption::BH); } break; - case 203: + case 204: /* Line 670 of lalr1.cc */ -#line 358 "../../s/cmdoptions.y" +#line 359 "../../s/cmdoptions.y" { options.SetReadImageFile((yysemantic_stack_[(2) - (2)].cstring)); options.SetDumpOption(DumpOption::BH); } break; - case 204: + case 205: /* Line 670 of lalr1.cc */ -#line 360 "../../s/cmdoptions.y" +#line 361 "../../s/cmdoptions.y" { options.SetReadImageFile((yysemantic_stack_[(1) - (1)].cstring)); options.SetDumpOption(DumpOption::PARTITIONS); } break; - case 205: + case 206: /* Line 670 of lalr1.cc */ -#line 362 "../../s/cmdoptions.y" +#line 363 "../../s/cmdoptions.y" { options.SetReadImageFile((yysemantic_stack_[(2) - (1)].cstring)); options.SetDumpOption(DumpOption::PLM); } break; - case 206: + case 207: /* Line 670 of lalr1.cc */ -#line 364 "../../s/cmdoptions.y" +#line 365 "../../s/cmdoptions.y" { options.SetReadImageFile((yysemantic_stack_[(2) - (1)].cstring)); options.SetDumpOption(DumpOption::PMC_CDO); } break; - case 207: + case 208: /* Line 670 of lalr1.cc */ -#line 366 "../../s/cmdoptions.y" +#line 367 "../../s/cmdoptions.y" { options.SetReadImageFile((yysemantic_stack_[(2) - (1)].cstring)); options.SetDumpOption(DumpOption::BOOT_FILES); } break; - case 208: + case 209: /* Line 670 of lalr1.cc */ -#line 368 "../../s/cmdoptions.y" +#line 369 "../../s/cmdoptions.y" { options.SetDumpOption(DumpOption::SLAVE_PDIS); } break; - case 209: + case 210: /* Line 670 of lalr1.cc */ -#line 371 "../../s/cmdoptions.y" +#line 372 "../../s/cmdoptions.y" { options.SetEncryptionDump(true,"aes_log.txt"); } break; - case 210: + case 211: /* Line 670 of lalr1.cc */ -#line 372 "../../s/cmdoptions.y" +#line 373 "../../s/cmdoptions.y" { options.SetEncryptionDump(true,(yysemantic_stack_[(1) - (1)].cstring)); } break; /* Line 670 of lalr1.cc */ -#line 1514 "cmdoptions.tab.cpp" +#line 1520 "cmdoptions.tab.cpp" default: break; } @@ -1722,35 +1728,35 @@ /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ - const signed char BisonParser::yypact_ninf_ = -75; + const signed char BisonParser::yypact_ninf_ = -76; const short int BisonParser::yypact_[] = { - -75, 11, 113, -75, -45, -62, 28, 103, -75, -75, - -75, -47, -74, 149, 0, 3, 99, 38, 107, -75, - -10, 50, 72, -75, -75, -45, -45, -75, 31, -45, - -49, -44, -42, 68, 54, -45, -45, -45, -45, -75, - -75, -75, -75, -75, -75, -75, -75, -75, -45, -75, - -75, -75, -75, -75, -75, -75, -75, -75, -75, -75, - -75, -75, -75, -75, -75, -75, -75, -75, -75, -75, - -75, -75, -75, -75, -75, -75, -75, -75, -75, -75, - -75, -75, -75, -75, -75, -75, -75, -75, -75, -75, - -75, -75, -75, -75, -75, -75, -75, -75, -75, -75, - -75, -75, -75, -75, -75, -75, -75, -75, -75, -75, - -75, -75, -75, -75, -75, -75, -75, -75, -75, -75, - -75, -75, -75, -75, -75, -75, -75, -75, -75, -75, - -75, -75, -75, -75, -75, -75, -75, -75, -75, -75, - -75, -75, -75, -75, -75, -75, -75, -75, -75, -75, - -75, -75, -75, -75, -75, -75, -75, -45, 15, -75, - -75, -75, -75, -75, -75, -75, -75, -67, -75, -75, - -65, -75, -75, -75, -75, -75, -75, -75, 52, -75, - -75, -75, -75, 80, -75, -75, -75, -75, -75, -75, - -75, -75, -75, -75, -45, -75, -75, 57, -75, 150, - -75, -75, -75, -75, -75, -75, -75, -75, -75, -75, - -75, -75, -75, -75, -75, -75, -75, -75, -75, -75, - -75, -75, -75, 60, 58, -75, -75, -75, -75, -75, - -75, 64, 66, 69, -75, 70, 84, -45, -75, 90, - -75, -75, -75 + -76, 11, 114, -76, -45, -62, 28, 104, -76, -76, + -76, -56, -75, 163, 0, 5, 84, -53, 108, -76, + 50, 76, 75, -76, -76, -45, -45, -76, 52, -45, + -49, -44, -42, 85, -47, -45, -45, -45, -45, -76, + -76, -76, -76, -76, -76, -76, -76, -76, -45, -76, + -76, -76, -76, -76, -76, -76, -76, -76, -76, -76, + -76, -76, -76, -76, -76, -76, -76, -76, -76, -76, + -76, -76, -76, -76, -76, -76, -76, -76, -76, -76, + -76, -76, -76, -76, -76, -76, -76, -76, -76, -76, + -76, -76, -76, -76, -76, -76, -76, -76, -76, -76, + -76, -76, -76, -76, -76, -76, -76, -76, -76, -76, + -76, -76, -76, -76, -76, -76, -76, -76, -76, -76, + -76, -76, -76, -76, -76, -76, -76, -76, -76, -76, + -76, -76, -76, -76, -76, -76, -76, -76, -76, -76, + -76, -76, -76, -76, -76, -76, -76, -76, -76, -76, + -76, -76, -76, -76, -76, -76, -76, -76, -45, 15, + -76, -76, -76, -76, -76, -76, -76, -76, -67, -76, + -76, -65, -76, -76, -76, -76, -76, -76, -76, 37, + -76, -76, -76, -76, 118, -76, -76, -76, -76, -76, + -76, -76, -76, -76, -76, -45, -76, -76, 58, -76, + 57, -76, -76, -76, -76, -76, -76, -76, -76, -76, + -76, -76, -76, -76, -76, -76, -76, -76, -76, -76, + -76, -76, -76, -76, 64, 67, -76, -76, -76, -76, + -76, -76, 68, 87, 89, -76, 92, 98, -45, -76, + 100, -76, -76, -76 }; /* YYDEFACT[S] -- default reduction number in state S. Performed when @@ -1760,50 +1766,50 @@ BisonParser::yydefact_[] = { 3, 0, 2, 1, 0, 49, 0, 51, 32, 19, - 18, 0, 80, 147, 0, 0, 0, 0, 0, 29, - 0, 0, 144, 30, 34, 0, 0, 17, 20, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 209, 4, - 7, 44, 45, 46, 43, 5, 163, 50, 0, 9, + 18, 0, 81, 148, 0, 0, 0, 0, 0, 29, + 0, 0, 145, 30, 34, 0, 0, 17, 20, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 210, 4, + 7, 44, 45, 46, 43, 5, 164, 50, 0, 9, 52, 53, 54, 55, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, - 73, 74, 77, 76, 75, 78, 79, 56, 13, 27, - 122, 81, 82, 83, 84, 85, 86, 87, 88, 119, - 89, 90, 91, 93, 92, 94, 95, 118, 120, 96, - 97, 98, 99, 100, 101, 102, 103, 111, 104, 105, - 106, 107, 108, 109, 110, 121, 112, 113, 114, 115, - 117, 116, 123, 124, 125, 126, 127, 128, 129, 130, - 131, 132, 133, 134, 135, 136, 138, 139, 140, 141, - 137, 142, 143, 14, 148, 149, 150, 151, 152, 12, - 47, 48, 6, 164, 165, 23, 208, 201, 204, 39, - 40, 174, 175, 176, 177, 28, 166, 0, 24, 168, - 0, 25, 145, 146, 11, 42, 16, 22, 0, 26, - 181, 182, 184, 0, 179, 180, 183, 31, 188, 187, - 35, 192, 191, 36, 190, 153, 154, 155, 10, 194, - 37, 193, 38, 41, 210, 33, 8, 203, 205, 206, - 207, 202, 170, 171, 167, 172, 173, 169, 21, 185, - 186, 178, 189, 0, 157, 196, 197, 198, 199, 200, - 195, 0, 0, 159, 156, 0, 0, 161, 158, 0, - 162, 15, 160 + 73, 74, 77, 76, 75, 78, 79, 80, 56, 13, + 27, 123, 82, 83, 84, 85, 86, 87, 88, 89, + 120, 90, 91, 92, 94, 93, 95, 96, 119, 121, + 97, 98, 99, 100, 101, 102, 103, 104, 112, 105, + 106, 107, 108, 109, 110, 111, 122, 113, 114, 115, + 116, 118, 117, 124, 125, 126, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 136, 137, 139, 140, 141, + 142, 138, 143, 144, 14, 149, 150, 151, 152, 153, + 12, 47, 48, 6, 165, 166, 23, 209, 202, 205, + 39, 40, 175, 176, 177, 178, 28, 167, 0, 24, + 169, 0, 25, 146, 147, 11, 42, 16, 22, 0, + 26, 182, 183, 185, 0, 180, 181, 184, 31, 189, + 188, 35, 193, 192, 36, 191, 154, 155, 156, 10, + 195, 37, 194, 38, 41, 211, 33, 8, 204, 206, + 207, 208, 203, 171, 172, 168, 173, 174, 170, 21, + 186, 187, 179, 190, 0, 158, 197, 198, 199, 200, + 201, 196, 0, 0, 160, 157, 0, 0, 162, 159, + 0, 163, 15, 161 }; /* YYPGOTO[NTERM-NUM]. */ const signed char BisonParser::yypgoto_[] = { - -75, -75, -75, -75, -6, -75, -75, -75, -75, -75, - -75, -75, -75, -75, -75, -75, -75, -75, -75, -75, - -75, -75, -75, -75, -75, -75, -75, -75, -75, -75, - -75, -75, -75 + -76, -76, -76, -76, -6, -76, -76, -76, -76, -76, + -76, -76, -76, -76, -76, -76, -76, -76, -76, -76, + -76, -76, -76, -76, -76, -76, -76, -76, -76, -76, + -76, -76, -76 }; /* YYDEFGOTO[NTERM-NUM]. */ const short int BisonParser::yydefgoto_[] = { - -1, 1, 2, 39, 45, 152, 40, 78, 143, 174, - 149, 197, 224, 233, 237, 241, 47, 155, 168, 171, - 214, 217, 165, 187, 221, 190, 193, 194, 202, 200, - 230, 159, 205 + -1, 1, 2, 39, 45, 153, 40, 79, 144, 175, + 150, 198, 225, 234, 238, 242, 47, 156, 169, 172, + 215, 218, 166, 188, 222, 191, 194, 195, 203, 201, + 231, 160, 206 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1813,32 +1819,32 @@ const unsigned char BisonParser::yytable_[] = { - 49, 180, 181, 182, 183, 184, 185, 188, 186, 191, - 158, 3, 212, 189, 215, 192, 213, 46, 216, 175, - 176, 150, 151, 179, 153, 154, 80, 166, 167, 199, - 201, 203, 204, 79, 48, 41, 42, 43, 44, 208, - 209, 210, 206, 81, 82, 83, 84, 85, 86, 87, - 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - 118, 119, 120, 121, 122, 123, 211, 169, 170, 124, - 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, - 135, 136, 137, 138, 139, 140, 141, 142, 41, 42, - 43, 44, 172, 173, 177, 178, 4, 5, 6, 160, - 7, 8, 9, 10, 11, 12, 13, 156, 195, 196, - 219, 220, 14, 15, 198, 218, 16, 161, 162, 163, - 17, 164, 18, 223, 231, 232, 19, 234, 20, 21, - 235, 207, 22, 238, 236, 23, 24, 25, 26, 27, - 28, 29, 30, 144, 145, 146, 147, 148, 239, 31, - 157, 32, 33, 242, 0, 34, 0, 0, 0, 41, - 42, 43, 44, 35, 0, 0, 0, 0, 222, 36, - 37, 38, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 69, 70, 0, 71, 72, 73, 74, 75, 76, - 0, 225, 226, 227, 228, 229, 0, 0, 0, 0, - 0, 240, 0, 0, 0, 0, 0, 0, 0, 0, + 49, 181, 182, 183, 184, 185, 186, 189, 187, 192, + 159, 3, 213, 190, 216, 193, 214, 46, 217, 176, + 177, 151, 152, 180, 80, 81, 154, 155, 161, 200, + 202, 204, 205, 199, 48, 41, 42, 43, 44, 209, + 210, 211, 207, 82, 83, 84, 85, 86, 87, 88, + 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, + 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, + 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, + 119, 120, 121, 122, 123, 124, 212, 167, 168, 125, + 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, + 136, 137, 138, 139, 140, 141, 142, 143, 41, 42, + 43, 44, 157, 170, 171, 173, 174, 4, 5, 6, + 219, 7, 8, 9, 10, 11, 12, 13, 226, 227, + 228, 229, 230, 14, 15, 178, 179, 16, 162, 163, + 164, 17, 165, 18, 224, 196, 197, 19, 232, 20, + 21, 235, 208, 22, 233, 158, 23, 24, 25, 26, + 27, 28, 29, 30, 41, 42, 43, 44, 220, 221, + 31, 236, 32, 33, 237, 239, 34, 145, 146, 147, + 148, 149, 240, 243, 35, 0, 0, 0, 0, 223, + 36, 37, 38, 50, 51, 52, 53, 54, 55, 56, + 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, + 67, 68, 69, 70, 0, 71, 72, 73, 74, 75, + 76, 77, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 241, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 77 + 0, 0, 0, 0, 0, 0, 78 }; /* YYCHECK. */ @@ -1847,30 +1853,30 @@ { 6, 50, 51, 52, 53, 54, 55, 51, 57, 51, 16, 0, 79, 57, 79, 57, 83, 79, 83, 25, - 26, 21, 22, 29, 21, 22, 100, 37, 38, 35, + 26, 21, 22, 29, 80, 100, 21, 22, 81, 35, 36, 37, 38, 80, 6, 80, 81, 82, 83, 24, - 25, 26, 48, 117, 118, 119, 120, 121, 122, 123, - 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, - 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, - 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, - 154, 155, 156, 157, 158, 159, 71, 37, 38, 163, - 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, - 174, 175, 176, 177, 178, 179, 180, 181, 80, 81, - 82, 83, 40, 41, 83, 84, 3, 4, 5, 81, - 7, 8, 9, 10, 11, 12, 13, 28, 60, 61, - 50, 51, 19, 20, 80, 83, 23, 30, 31, 32, - 27, 34, 29, 86, 84, 87, 33, 83, 35, 36, - 84, 157, 39, 83, 85, 42, 43, 44, 45, 46, - 47, 48, 49, 14, 15, 16, 17, 18, 84, 56, - 71, 58, 59, 83, -1, 62, -1, -1, -1, 80, - 81, 82, 83, 70, -1, -1, -1, -1, 194, 76, - 77, 78, 89, 90, 91, 92, 93, 94, 95, 96, - 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, - 107, 108, 109, -1, 111, 112, 113, 114, 115, 116, - -1, 71, 72, 73, 74, 75, -1, -1, -1, -1, - -1, 237, -1, -1, -1, -1, -1, -1, -1, -1, + 25, 26, 48, 118, 119, 120, 121, 122, 123, 124, + 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, + 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, + 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, + 155, 156, 157, 158, 159, 160, 71, 37, 38, 164, + 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, + 175, 176, 177, 178, 179, 180, 181, 182, 80, 81, + 82, 83, 28, 37, 38, 40, 41, 3, 4, 5, + 83, 7, 8, 9, 10, 11, 12, 13, 71, 72, + 73, 74, 75, 19, 20, 83, 84, 23, 30, 31, + 32, 27, 34, 29, 86, 60, 61, 33, 84, 35, + 36, 83, 158, 39, 87, 71, 42, 43, 44, 45, + 46, 47, 48, 49, 80, 81, 82, 83, 50, 51, + 56, 84, 58, 59, 85, 83, 62, 14, 15, 16, + 17, 18, 84, 83, 70, -1, -1, -1, -1, 195, + 76, 77, 78, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, + 106, 107, 108, 109, -1, 111, 112, 113, 114, 115, + 116, 117, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 238, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 151 + -1, -1, -1, -1, -1, -1, 152 }; /* STOS_[STATE-NUM] -- The (internal number of the) accessing @@ -1878,31 +1884,31 @@ const unsigned char BisonParser::yystos_[] = { - 0, 183, 184, 0, 3, 4, 5, 7, 8, 9, + 0, 184, 185, 0, 3, 4, 5, 7, 8, 9, 10, 11, 12, 13, 19, 20, 23, 27, 29, 33, 35, 36, 39, 42, 43, 44, 45, 46, 47, 48, - 49, 56, 58, 59, 62, 70, 76, 77, 78, 185, - 188, 80, 81, 82, 83, 186, 79, 198, 6, 186, + 49, 56, 58, 59, 62, 70, 76, 77, 78, 186, + 189, 80, 81, 82, 83, 187, 79, 199, 6, 187, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, - 109, 111, 112, 113, 114, 115, 116, 151, 189, 80, - 100, 117, 118, 119, 120, 121, 122, 123, 124, 125, + 109, 111, 112, 113, 114, 115, 116, 117, 152, 190, + 80, 100, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, - 156, 157, 158, 159, 163, 164, 165, 166, 167, 168, + 156, 157, 158, 159, 160, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 179, 180, 181, 190, 14, 15, 16, 17, 18, 192, - 21, 22, 187, 21, 22, 199, 28, 71, 186, 213, - 81, 30, 31, 32, 34, 204, 37, 38, 200, 37, - 38, 201, 40, 41, 191, 186, 186, 83, 84, 186, - 50, 51, 52, 53, 54, 55, 57, 205, 51, 57, - 207, 51, 57, 208, 209, 60, 61, 193, 80, 186, - 211, 186, 210, 186, 186, 214, 186, 186, 24, 25, - 26, 71, 79, 83, 202, 79, 83, 203, 83, 50, - 51, 206, 186, 86, 194, 71, 72, 73, 74, 75, - 212, 84, 87, 195, 83, 84, 85, 196, 83, 84, - 186, 197, 83 + 179, 180, 181, 182, 191, 14, 15, 16, 17, 18, + 193, 21, 22, 188, 21, 22, 200, 28, 71, 187, + 214, 81, 30, 31, 32, 34, 205, 37, 38, 201, + 37, 38, 202, 40, 41, 192, 187, 187, 83, 84, + 187, 50, 51, 52, 53, 54, 55, 57, 206, 51, + 57, 208, 51, 57, 209, 210, 60, 61, 194, 80, + 187, 212, 187, 211, 187, 187, 215, 187, 187, 24, + 25, 26, 71, 79, 83, 203, 79, 83, 204, 83, + 50, 51, 207, 187, 86, 195, 71, 72, 73, 74, + 75, 213, 84, 87, 196, 83, 84, 85, 197, 83, + 84, 187, 198, 83 }; #if YYDEBUG @@ -1929,7 +1935,7 @@ 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, - 435, 436 + 435, 436, 437 }; #endif @@ -1937,28 +1943,28 @@ const unsigned char BisonParser::yyr1_[] = { - 0, 182, 183, 184, 184, 185, 185, 185, 185, 185, - 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, - 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, - 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, - 185, 185, 185, 186, 186, 186, 186, 187, 187, 188, - 188, 189, 189, 189, 189, 189, 189, 189, 189, 189, - 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, - 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, - 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, - 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, - 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, + 0, 183, 184, 185, 185, 186, 186, 186, 186, 186, + 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, + 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, + 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, + 186, 186, 186, 187, 187, 187, 187, 188, 188, 189, + 189, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, - 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, - 190, 190, 190, 190, 191, 191, 191, 192, 192, 192, - 192, 192, 192, 193, 193, 194, 194, 195, 195, 196, - 196, 197, 197, 198, 199, 199, 200, 200, 201, 201, - 202, 202, 203, 203, 204, 204, 204, 204, 205, 205, - 205, 205, 205, 205, 205, 206, 206, 207, 207, 208, - 208, 209, 209, 210, 211, 211, 212, 212, 212, 212, - 212, 213, 213, 213, 213, 213, 213, 213, 213, 214, - 214 + 190, 191, 191, 191, 191, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 191, 192, 192, 192, 193, 193, + 193, 193, 193, 193, 194, 194, 195, 195, 196, 196, + 197, 197, 198, 198, 199, 200, 200, 201, 201, 202, + 202, 203, 203, 204, 204, 205, 205, 205, 205, 206, + 206, 206, 206, 206, 206, 206, 207, 207, 208, 208, + 209, 209, 210, 210, 211, 212, 212, 213, 213, 213, + 213, 213, 214, 214, 214, 214, 214, 214, 214, 214, + 215, 215 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1973,20 +1979,20 @@ 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, + 1, 1, 1, 1, 1, 1, 0, 3, 0, 3, + 0, 3, 0, 1, 1, 1, 1, 1, 2, 1, + 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, - 1, 1, 1, 1, 1, 0, 3, 0, 3, 0, - 3, 0, 1, 1, 1, 1, 1, 2, 1, 2, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, - 1, 1, 2, 2, 1, 2, 2, 2, 1, 0, - 1 + 2, 1, 1, 1, 1, 1, 2, 1, 1, 1, + 1, 1, 1, 2, 2, 1, 2, 2, 2, 1, + 0, 1 }; #if YYDEBUG @@ -2014,7 +2020,7 @@ "HPADHDR", "H_SPKSIGN", "HPACKAGE", "HENCRYPT", "HGENKEYS", "HDQSPI", "HLOG", "HZYNQMPES1", "HPROCESSBIT", "HNONBOOTING", "HENCRDUMP", "HPOSTPROCESS", "HVERIFY", "HSECUREDEBUG", "HREAD", "HVERIFYKDF", - "HDUMP", "HDUMPDIR", "H_BIF_INIT", "H_BIF_UDFBH", "H_BIF_AES", + "HDUMP", "HDUMPDIR", "HOVLCDO", "H_BIF_INIT", "H_BIF_UDFBH", "H_BIF_AES", "H_BIF_PPK", "H_BIF_PSK", "H_BIF_SPK", "H_BIF_SSK", "H_BIF_SPKSIGN", "H_BIF_HIVEC", "H_BIF_HDRSIGN", "H_BIF_BOOTIMAGE", "H_BIF_BL", "H_BIF_PID", "H_BIF_ENCR", "H_BIF_AUTH", "H_BIF_CHKSM", @@ -2044,53 +2050,53 @@ const BisonParser::rhs_number_type BisonParser::yyrhs_[] = { - 183, 0, -1, 184, -1, -1, 184, 185, -1, 3, - 186, -1, 19, 187, -1, 188, -1, 5, 6, 186, - -1, 5, 186, -1, 62, 80, -1, 39, 191, -1, - 13, 192, -1, 7, 189, -1, 12, 190, -1, 59, - 193, 194, 195, 196, 197, -1, 45, 186, -1, 46, + 184, 0, -1, 185, -1, -1, 185, 186, -1, 3, + 187, -1, 19, 188, -1, 189, -1, 5, 6, 187, + -1, 5, 187, -1, 62, 80, -1, 39, 192, -1, + 13, 193, -1, 7, 190, -1, 12, 191, -1, 59, + 194, 195, 196, 197, 198, -1, 45, 187, -1, 46, -1, 10, -1, 9, -1, 47, -1, 47, 84, 83, - -1, 47, 83, -1, 20, 199, -1, 35, 200, -1, - 36, 201, -1, 48, 186, -1, 11, 80, -1, 29, - 204, -1, 33, -1, 42, -1, 49, 205, -1, 8, - -1, 78, 214, -1, 43, -1, 56, 207, -1, 58, - 208, -1, 70, 211, -1, 76, 210, -1, 23, 213, - -1, 27, 81, -1, 77, 186, -1, 44, 186, -1, + -1, 47, 83, -1, 20, 200, -1, 35, 201, -1, + 36, 202, -1, 48, 187, -1, 11, 80, -1, 29, + 205, -1, 33, -1, 42, -1, 49, 206, -1, 8, + -1, 78, 215, -1, 43, -1, 56, 208, -1, 58, + 209, -1, 70, 212, -1, 76, 211, -1, 23, 214, + -1, 27, 81, -1, 77, 187, -1, 44, 187, -1, 83, -1, 80, -1, 81, -1, 82, -1, 21, -1, - 22, -1, 4, -1, 4, 198, -1, -1, 89, -1, - 90, -1, 91, -1, 92, -1, 151, -1, 93, -1, + 22, -1, 4, -1, 4, 199, -1, -1, 89, -1, + 90, -1, 91, -1, 92, -1, 152, -1, 93, -1, 94, -1, 95, -1, 96, -1, 97, -1, 98, -1, 99, -1, 100, -1, 101, -1, 102, -1, 103, -1, 104, -1, 105, -1, 106, -1, 107, -1, 108, -1, 109, -1, 111, -1, 114, -1, 113, -1, 112, -1, - 115, -1, 116, -1, -1, 117, -1, 118, -1, 119, + 115, -1, 116, -1, 117, -1, -1, 118, -1, 119, -1, 120, -1, 121, -1, 122, -1, 123, -1, 124, - -1, 126, -1, 127, -1, 128, -1, 130, -1, 129, - -1, 131, -1, 132, -1, 135, -1, 136, -1, 137, + -1, 125, -1, 127, -1, 128, -1, 129, -1, 131, + -1, 130, -1, 132, -1, 133, -1, 136, -1, 137, -1, 138, -1, 139, -1, 140, -1, 141, -1, 142, - -1, 144, -1, 145, -1, 146, -1, 147, -1, 148, - -1, 149, -1, 150, -1, 143, -1, 152, -1, 153, - -1, 154, -1, 155, -1, 157, -1, 156, -1, 133, - -1, 125, -1, 134, -1, 151, -1, 100, -1, 158, - -1, 159, -1, 163, -1, 164, -1, 165, -1, 166, + -1, 143, -1, 145, -1, 146, -1, 147, -1, 148, + -1, 149, -1, 150, -1, 151, -1, 144, -1, 153, + -1, 154, -1, 155, -1, 156, -1, 158, -1, 157, + -1, 134, -1, 126, -1, 135, -1, 152, -1, 100, + -1, 159, -1, 160, -1, 164, -1, 165, -1, 166, -1, 167, -1, 168, -1, 169, -1, 170, -1, 171, - -1, 172, -1, 173, -1, 174, -1, 179, -1, 175, - -1, 176, -1, 177, -1, 178, -1, 180, -1, 181, - -1, -1, 40, -1, 41, -1, -1, 14, -1, 15, - -1, 16, -1, 17, -1, 18, -1, 60, -1, 61, - -1, -1, 86, 84, 83, -1, -1, 87, 84, 83, - -1, -1, 85, 84, 83, -1, -1, 186, -1, 79, - -1, 21, -1, 22, -1, 37, -1, 38, 202, -1, - 37, -1, 38, 203, -1, 79, -1, 83, -1, 79, - -1, 83, -1, 30, -1, 31, -1, 32, -1, 34, - -1, 53, 206, -1, 54, -1, 55, -1, 50, -1, - 51, -1, 57, -1, 52, -1, 50, -1, 51, -1, - 57, -1, 51, -1, 209, 186, -1, 209, -1, 57, - -1, 51, -1, 186, -1, 186, -1, 186, 212, -1, - 71, -1, 72, -1, 73, -1, 74, -1, 75, -1, - 71, -1, 186, 71, -1, 71, 186, -1, 186, -1, - 186, 24, -1, 186, 25, -1, 186, 26, -1, 28, - -1, -1, 186, -1 + -1, 172, -1, 173, -1, 174, -1, 175, -1, 180, + -1, 176, -1, 177, -1, 178, -1, 179, -1, 181, + -1, 182, -1, -1, 40, -1, 41, -1, -1, 14, + -1, 15, -1, 16, -1, 17, -1, 18, -1, 60, + -1, 61, -1, -1, 86, 84, 83, -1, -1, 87, + 84, 83, -1, -1, 85, 84, 83, -1, -1, 187, + -1, 79, -1, 21, -1, 22, -1, 37, -1, 38, + 203, -1, 37, -1, 38, 204, -1, 79, -1, 83, + -1, 79, -1, 83, -1, 30, -1, 31, -1, 32, + -1, 34, -1, 53, 207, -1, 54, -1, 55, -1, + 50, -1, 51, -1, 57, -1, 52, -1, 50, -1, + 51, -1, 57, -1, 51, -1, 210, 187, -1, 210, + -1, 57, -1, 51, -1, 187, -1, 187, -1, 187, + 213, -1, 71, -1, 72, -1, 73, -1, 74, -1, + 75, -1, 71, -1, 187, 71, -1, 71, 187, -1, + 187, -1, 187, 24, -1, 187, 25, -1, 187, 26, + -1, 28, -1, -1, 187, -1 }; /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in @@ -2106,20 +2112,20 @@ 134, 137, 138, 140, 142, 144, 146, 148, 150, 152, 154, 156, 158, 160, 162, 164, 166, 168, 170, 172, 174, 176, 178, 180, 182, 184, 186, 188, 190, 192, - 194, 195, 197, 199, 201, 203, 205, 207, 209, 211, + 194, 196, 197, 199, 201, 203, 205, 207, 209, 211, 213, 215, 217, 219, 221, 223, 225, 227, 229, 231, 233, 235, 237, 239, 241, 243, 245, 247, 249, 251, 253, 255, 257, 259, 261, 263, 265, 267, 269, 271, 273, 275, 277, 279, 281, 283, 285, 287, 289, 291, 293, 295, 297, 299, 301, 303, 305, 307, 309, 311, - 313, 315, 317, 319, 321, 322, 324, 326, 327, 329, - 331, 333, 335, 337, 339, 341, 342, 346, 347, 351, - 352, 356, 357, 359, 361, 363, 365, 367, 370, 372, - 375, 377, 379, 381, 383, 385, 387, 389, 391, 394, + 313, 315, 317, 319, 321, 323, 324, 326, 328, 329, + 331, 333, 335, 337, 339, 341, 343, 344, 348, 349, + 353, 354, 358, 359, 361, 363, 365, 367, 369, 372, + 374, 377, 379, 381, 383, 385, 387, 389, 391, 393, 396, 398, 400, 402, 404, 406, 408, 410, 412, 414, - 417, 419, 421, 423, 425, 427, 430, 432, 434, 436, - 438, 440, 442, 445, 448, 450, 453, 456, 459, 461, - 462 + 416, 419, 421, 423, 425, 427, 429, 432, 434, 436, + 438, 440, 442, 444, 447, 450, 452, 455, 458, 461, + 463, 464 }; /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ @@ -2134,20 +2140,20 @@ 159, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, - 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, + 195, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, - 257, 258, 259, 260, 263, 264, 265, 268, 269, 270, - 271, 272, 273, 276, 277, 280, 280, 281, 281, 282, - 282, 283, 283, 285, 287, 288, 291, 292, 295, 296, - 299, 300, 303, 304, 307, 308, 309, 310, 313, 314, - 315, 316, 317, 318, 319, 322, 323, 326, 328, 331, - 332, 334, 336, 340, 343, 345, 348, 349, 350, 351, - 352, 355, 356, 358, 360, 362, 364, 366, 368, 371, - 372 + 257, 258, 259, 260, 261, 264, 265, 266, 269, 270, + 271, 272, 273, 274, 277, 278, 281, 281, 282, 282, + 283, 283, 284, 284, 286, 288, 289, 292, 293, 296, + 297, 300, 301, 304, 305, 308, 309, 310, 311, 314, + 315, 316, 317, 318, 319, 320, 323, 324, 327, 329, + 332, 333, 335, 337, 341, 344, 346, 349, 350, 351, + 352, 353, 356, 357, 359, 361, 363, 365, 367, 369, + 372, 373 }; // Print the state stack on the debug stream. @@ -2230,7 +2236,7 @@ 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 181 + 175, 176, 177, 178, 179, 180, 181, 182 }; if ((unsigned int) t <= yyuser_token_number_max_) return translate_table[t]; @@ -2239,24 +2245,24 @@ } const int BisonParser::yyeof_ = 0; - const int BisonParser::yylast_ = 254; + const int BisonParser::yylast_ = 256; const int BisonParser::yynnts_ = 33; const int BisonParser::yyempty_ = -2; const int BisonParser::yyfinal_ = 3; const int BisonParser::yyterror_ = 1; const int BisonParser::yyerrcode_ = 256; - const int BisonParser::yyntokens_ = 182; + const int BisonParser::yyntokens_ = 183; - const unsigned int BisonParser::yyuser_token_number_max_ = 436; + const unsigned int BisonParser::yyuser_token_number_max_ = 437; const BisonParser::token_number_type BisonParser::yyundef_token_ = 2; /* Line 1141 of lalr1.cc */ #line 23 "../../s/cmdoptions.y" } // CO /* Line 1141 of lalr1.cc */ -#line 2258 "cmdoptions.tab.cpp" +#line 2264 "cmdoptions.tab.cpp" /* Line 1142 of lalr1.cc */ -#line 375 "../../s/cmdoptions.y" +#line 376 "../../s/cmdoptions.y" @@ -2401,6 +2407,10 @@ std::cout << DUMPDIRHELP << std::endl; break; + case CO::BisonParser::token::HOVLCDO: + std::cout << OVERLAYCDO << std::endl; + break; + case 0: std::cout << HELP << std::endl; break; diff -Nru xilinx-bootgen-2021.2/cmdoptions.tab.hpp xilinx-bootgen-2022.1/cmdoptions.tab.hpp --- xilinx-bootgen-2021.2/cmdoptions.tab.hpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/cmdoptions.tab.hpp 2022-03-30 09:29:13.000000000 +0000 @@ -216,71 +216,72 @@ HVERIFYKDF = 369, HDUMP = 370, HDUMPDIR = 371, - H_BIF_INIT = 372, - H_BIF_UDFBH = 373, - H_BIF_AES = 374, - H_BIF_PPK = 375, - H_BIF_PSK = 376, - H_BIF_SPK = 377, - H_BIF_SSK = 378, - H_BIF_SPKSIGN = 379, - H_BIF_HIVEC = 380, - H_BIF_HDRSIGN = 381, - H_BIF_BOOTIMAGE = 382, - H_BIF_BL = 383, - H_BIF_PID = 384, - H_BIF_ENCR = 385, - H_BIF_AUTH = 386, - H_BIF_CHKSM = 387, - H_BIF_ELYHNDOFF = 388, - H_BIF_BHSIGN = 389, - H_BIF_POWNER = 390, - H_BIF_PRESIGN = 391, - H_BIF_UDF = 392, - H_BIF_XIP = 393, - H_BIF_ALIGN = 394, - H_BIF_OFFSET = 395, - H_BIF_RES = 396, - H_BIF_LOAD = 397, - H_BIF_TZ = 398, - H_BIF_STARTUP = 399, - H_BIF_KEYSRC = 400, - H_BIF_FSBLCFG = 401, - H_BIF_BOOTDEV = 402, - H_BIF_DESTCPU = 403, - H_BIF_DESTDEV = 404, - H_BIF_EL = 405, - H_SPLIT = 406, - H_BIF_AUTHPARAM = 407, - H_BIF_BHKEY = 408, - H_BIF_PFW = 409, - H_BIF_BLOCKS = 410, - H_BIF_METAL = 411, - H_BIF_BHIV = 412, - H_BIF_BOOTVEC = 413, - H_BIF_PUFDATA = 414, - H_BIF_PTYPE = 415, - H_BIF_IMAGECFG = 416, - H_BIF_PMCCONFIG = 417, - H_BIF_AARCH32 = 418, - H_BIF_BIGENDIAN = 419, - H_BIF_BOOTCONFIG = 420, - H_BIF_COPY = 421, - H_BIF_CORE = 422, - H_BIF_DELAY_HANDOFF = 423, - H_BIF_DELAY_LOAD = 424, - H_BIF_FILE = 425, - H_BIF_ID = 426, - H_BIF_IMAGE = 427, - H_BIF_METAHDR = 428, - H_BIF_NAME = 429, - H_BIF_PARTITION = 430, - H_BIF_SLR = 431, - H_BIF_TYPE = 432, - H_BIF_KEYSRCENCR = 433, - H_BIF_PARENTID = 434, - H_DPACM_ENABLE = 435, - H_BIF_USERKEYS = 436 + HOVLCDO = 372, + H_BIF_INIT = 373, + H_BIF_UDFBH = 374, + H_BIF_AES = 375, + H_BIF_PPK = 376, + H_BIF_PSK = 377, + H_BIF_SPK = 378, + H_BIF_SSK = 379, + H_BIF_SPKSIGN = 380, + H_BIF_HIVEC = 381, + H_BIF_HDRSIGN = 382, + H_BIF_BOOTIMAGE = 383, + H_BIF_BL = 384, + H_BIF_PID = 385, + H_BIF_ENCR = 386, + H_BIF_AUTH = 387, + H_BIF_CHKSM = 388, + H_BIF_ELYHNDOFF = 389, + H_BIF_BHSIGN = 390, + H_BIF_POWNER = 391, + H_BIF_PRESIGN = 392, + H_BIF_UDF = 393, + H_BIF_XIP = 394, + H_BIF_ALIGN = 395, + H_BIF_OFFSET = 396, + H_BIF_RES = 397, + H_BIF_LOAD = 398, + H_BIF_TZ = 399, + H_BIF_STARTUP = 400, + H_BIF_KEYSRC = 401, + H_BIF_FSBLCFG = 402, + H_BIF_BOOTDEV = 403, + H_BIF_DESTCPU = 404, + H_BIF_DESTDEV = 405, + H_BIF_EL = 406, + H_SPLIT = 407, + H_BIF_AUTHPARAM = 408, + H_BIF_BHKEY = 409, + H_BIF_PFW = 410, + H_BIF_BLOCKS = 411, + H_BIF_METAL = 412, + H_BIF_BHIV = 413, + H_BIF_BOOTVEC = 414, + H_BIF_PUFDATA = 415, + H_BIF_PTYPE = 416, + H_BIF_IMAGECFG = 417, + H_BIF_PMCCONFIG = 418, + H_BIF_AARCH32 = 419, + H_BIF_BIGENDIAN = 420, + H_BIF_BOOTCONFIG = 421, + H_BIF_COPY = 422, + H_BIF_CORE = 423, + H_BIF_DELAY_HANDOFF = 424, + H_BIF_DELAY_LOAD = 425, + H_BIF_FILE = 426, + H_BIF_ID = 427, + H_BIF_IMAGE = 428, + H_BIF_METAHDR = 429, + H_BIF_NAME = 430, + H_BIF_PARTITION = 431, + H_BIF_SLR = 432, + H_BIF_TYPE = 433, + H_BIF_KEYSRCENCR = 434, + H_BIF_PARENTID = 435, + H_DPACM_ENABLE = 436, + H_BIF_USERKEYS = 437 }; }; @@ -457,7 +458,7 @@ #line 23 "../../s/cmdoptions.y" } // CO /* Line 33 of lalr1.cc */ -#line 461 "cmdoptions.tab.hpp" +#line 462 "cmdoptions.tab.hpp" diff -Nru xilinx-bootgen-2021.2/cmdoptions.y xilinx-bootgen-2022.1/cmdoptions.y --- xilinx-bootgen-2021.2/cmdoptions.y 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/cmdoptions.y 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -89,7 +89,7 @@ %token HBIFHELP HARCH HIMAGE HFILL HO HP HW HEFUSEPPKBITS HGENHASHES HLEGACY HPADHDR H_SPKSIGN %token HPACKAGE HENCRYPT HGENKEYS HDQSPI HLOG HZYNQMPES1 HPROCESSBIT HNONBOOTING HENCRDUMP HPOSTPROCESS -%token HVERIFY HSECUREDEBUG HREAD HVERIFYKDF HDUMP HDUMPDIR +%token HVERIFY HSECUREDEBUG HREAD HVERIFYKDF HDUMP HDUMPDIR HOVLCDO %token H_BIF_INIT H_BIF_UDFBH H_BIF_AES H_BIF_PPK H_BIF_PSK H_BIF_SPK H_BIF_SSK H_BIF_SPKSIGN H_BIF_HIVEC %token H_BIF_HDRSIGN H_BIF_BOOTIMAGE H_BIF_BL H_BIF_PID H_BIF_ENCR H_BIF_AUTH H_BIF_CHKSM H_BIF_ELYHNDOFF H_BIF_BHSIGN @@ -192,6 +192,7 @@ | HSECUREDEBUG { ShowCmdHelp(CO::BisonParser::token::HSECUREDEBUG); exit(0); } | HDUMP { ShowCmdHelp(CO::BisonParser::token::HDUMP); exit(0); } | HDUMPDIR { ShowCmdHelp(CO::BisonParser::token::HDUMPDIR); exit(0); } + | HOVLCDO { ShowCmdHelp(CO::BisonParser::token::HOVLCDO); exit(0); } ; bifhelpoption : /* empty */ { ShowBifHelp(0); exit(0); } @@ -516,6 +517,10 @@ std::cout << DUMPDIRHELP << std::endl; break; + case CO::BisonParser::token::HOVLCDO: + std::cout << OVERLAYCDO << std::endl; + break; + case 0: std::cout << HELP << std::endl; break; diff -Nru xilinx-bootgen-2021.2/cmdoptions.yy.cpp xilinx-bootgen-2022.1/cmdoptions.yy.cpp --- xilinx-bootgen-2021.2/cmdoptions.yy.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/cmdoptions.yy.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -406,8 +406,8 @@ (yy_c_buf_p) = yy_cp; /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */ -#define YY_NUM_RULES 181 -#define YY_END_OF_BUFFER 182 +#define YY_NUM_RULES 182 +#define YY_END_OF_BUFFER 183 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -415,119 +415,120 @@ flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[1010] = +static yyconst flex_int16_t yy_accept[1020] = { 0, - 0, 0, 182, 180, 178, 179, 176, 180, 37, 175, - 175, 176, 174, 174, 36, 174, 175, 175, 175, 175, - 174, 174, 174, 174, 174, 174, 175, 175, 7, 175, - 175, 175, 175, 87, 88, 175, 175, 175, 175, 175, - 89, 175, 175, 178, 179, 176, 0, 0, 175, 175, - 175, 175, 175, 175, 175, 175, 81, 175, 175, 175, - 6, 8, 68, 175, 175, 9, 175, 1, 176, 174, - 175, 0, 175, 175, 175, 174, 74, 174, 175, 175, - 175, 174, 70, 175, 175, 175, 175, 175, 174, 175, - 175, 174, 174, 174, 175, 175, 175, 174, 175, 175, - - 175, 175, 175, 175, 175, 119, 72, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 10, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 177, 0, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 0, - 2, 176, 3, 0, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 31, 175, 175, - 175, 175, 175, 174, 175, 175, 175, 175, 175, 175, - - 174, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 71, 175, 175, 175, 175, 175, 175, - 99, 30, 175, 175, 175, 175, 11, 175, 175, 175, - 175, 53, 73, 140, 40, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 54, 175, 175, 125, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 0, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 12, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 22, 26, - 175, 175, 175, 175, 84, 52, 175, 175, 175, 175, - - 175, 175, 175, 175, 114, 115, 175, 175, 175, 175, - 175, 109, 175, 175, 175, 175, 175, 175, 175, 118, - 86, 67, 175, 175, 175, 175, 23, 175, 15, 128, - 27, 175, 175, 151, 175, 122, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 108, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 126, 175, 175, 175, 175, 175, - 175, 64, 63, 175, 175, 175, 175, 39, 175, 175, - 5, 175, 82, 175, 175, 175, 175, 175, 175, 175, - 175, 69, 175, 175, 175, 175, 175, 175, 175, 175, - - 175, 175, 175, 20, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 16, 175, 175, 175, 175, 175, - 175, 57, 21, 175, 13, 175, 175, 175, 175, 175, - 167, 85, 175, 175, 175, 175, 175, 175, 143, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 169, 175, 175, 175, - 17, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 38, 175, 175, 175, 175, 175, 4, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 28, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - - 175, 163, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 127, 92, 175, 175, 175, 149, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 129, 175, 175, 104, 66, 175, 175, 65, 175, - 175, 175, 175, 175, 175, 175, 175, 45, 175, 175, - 175, 175, 175, 175, 175, 175, 76, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - - 175, 175, 175, 175, 175, 96, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 41, 175, 131, 145, 175, 132, 175, 150, 175, 175, - 133, 175, 134, 35, 175, 152, 175, 175, 175, 175, - 14, 175, 175, 175, 175, 175, 175, 175, 175, 19, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 24, 175, 175, 175, 175, 175, 175, 175, 175, - 83, 175, 175, 175, 175, 175, 175, 175, 142, 175, - 175, 175, 175, 175, 110, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - - 175, 34, 175, 175, 175, 175, 171, 175, 175, 175, - 25, 175, 146, 173, 175, 147, 175, 175, 18, 175, - 175, 44, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 148, 175, 175, - 164, 175, 175, 175, 175, 175, 175, 137, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 56, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 124, 123, 175, 175, 175, 175, 175, 159, 175, - 100, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 79, 175, 130, 175, - - 175, 161, 175, 112, 175, 175, 42, 138, 175, 175, - 117, 175, 175, 175, 175, 58, 59, 175, 139, 175, - 175, 175, 175, 175, 175, 121, 102, 175, 175, 175, - 175, 175, 175, 175, 43, 175, 105, 175, 175, 175, - 175, 175, 175, 175, 175, 60, 175, 175, 175, 175, - 175, 175, 75, 175, 160, 175, 168, 113, 155, 170, - 175, 175, 175, 175, 175, 175, 175, 175, 154, 175, - 175, 175, 175, 175, 95, 175, 175, 162, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 80, - 62, 175, 175, 175, 175, 111, 175, 175, 175, 175, - - 172, 175, 175, 90, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 94, 175, 175, 175, 47, - 175, 175, 175, 78, 175, 175, 175, 61, 175, 175, - 116, 175, 175, 175, 166, 175, 175, 175, 97, 175, - 175, 55, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 51, 175, 175, 175, 175, 141, 175, 175, 98, - 175, 175, 175, 175, 175, 93, 175, 175, 175, 175, - 33, 32, 175, 175, 46, 175, 175, 175, 156, 175, - 103, 158, 91, 136, 175, 144, 175, 175, 175, 77, - 48, 175, 175, 175, 175, 175, 175, 106, 175, 175, + 0, 0, 183, 181, 179, 180, 177, 181, 37, 176, + 176, 177, 175, 175, 36, 175, 176, 176, 176, 176, + 175, 175, 175, 175, 175, 175, 176, 176, 7, 176, + 176, 176, 176, 87, 88, 176, 176, 176, 176, 176, + 89, 176, 176, 179, 180, 177, 0, 0, 176, 176, + 176, 176, 176, 176, 176, 176, 81, 176, 176, 176, + 6, 8, 68, 176, 176, 9, 176, 1, 177, 175, + 176, 0, 176, 176, 176, 175, 74, 175, 176, 176, + 176, 175, 70, 176, 176, 176, 176, 176, 175, 176, + 176, 175, 175, 175, 176, 176, 176, 175, 176, 176, + + 176, 176, 176, 176, 176, 120, 72, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 176, 10, 176, + 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 178, 0, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, + 0, 2, 177, 3, 0, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 176, 31, 176, + 176, 176, 176, 176, 175, 176, 176, 176, 176, 176, + + 176, 175, 176, 176, 176, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 71, 176, 176, 176, 176, 176, + 176, 99, 30, 176, 176, 176, 176, 11, 176, 176, + 176, 176, 176, 53, 73, 141, 40, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 54, 176, 176, 126, + 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, + 176, 176, 176, 0, 176, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 12, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, + 22, 26, 176, 176, 176, 176, 84, 52, 176, 176, + + 176, 176, 176, 176, 176, 176, 115, 116, 176, 176, + 176, 176, 176, 109, 176, 176, 176, 176, 176, 176, + 176, 119, 86, 67, 176, 176, 176, 176, 23, 176, + 15, 129, 27, 176, 176, 152, 176, 123, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 108, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 127, 176, 176, + 176, 176, 176, 176, 64, 63, 176, 176, 176, 176, + 39, 176, 176, 5, 176, 82, 176, 176, 176, 176, + 176, 176, 176, 176, 69, 176, 176, 176, 176, 176, + + 176, 176, 176, 176, 176, 176, 20, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 16, 176, 176, + 176, 176, 176, 176, 57, 21, 176, 13, 176, 176, + 176, 176, 176, 168, 85, 176, 176, 176, 176, 176, + 176, 176, 144, 176, 176, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, + 170, 176, 176, 176, 17, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 38, 176, 176, 176, + 176, 176, 4, 176, 176, 176, 176, 176, 176, 176, + 176, 176, 28, 176, 176, 176, 176, 176, 176, 176, + + 176, 176, 176, 176, 176, 164, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 128, 92, 176, + 176, 176, 150, 176, 176, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 130, 176, 176, 104, + 66, 176, 176, 65, 176, 176, 176, 176, 176, 176, + 176, 176, 45, 176, 176, 176, 176, 176, 176, 176, + 176, 76, 176, 176, 176, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, + + 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, + 96, 176, 176, 176, 176, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 41, 176, 132, 146, + 176, 133, 176, 151, 176, 176, 134, 176, 135, 35, + 176, 153, 176, 176, 176, 176, 14, 176, 176, 176, + 176, 176, 176, 176, 176, 19, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 24, 176, 176, + 176, 176, 176, 176, 176, 176, 83, 176, 176, 176, + 176, 176, 176, 176, 143, 176, 176, 176, 176, 176, + 110, 176, 176, 176, 176, 176, 176, 176, 176, 176, + + 176, 176, 176, 176, 176, 176, 176, 176, 34, 176, + 176, 176, 176, 172, 176, 176, 176, 25, 176, 147, + 174, 176, 148, 176, 176, 18, 176, 176, 44, 176, + 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 149, 176, 176, 165, 176, 176, + 176, 176, 176, 176, 138, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 176, 56, 176, + 176, 176, 176, 176, 176, 176, 176, 176, 176, 125, + 124, 176, 176, 176, 176, 176, 160, 176, 100, 176, + 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, + + 176, 176, 176, 176, 79, 176, 131, 176, 176, 162, + 176, 113, 176, 176, 42, 139, 176, 176, 118, 176, + 176, 176, 176, 58, 59, 176, 140, 176, 176, 176, + 176, 176, 176, 122, 102, 176, 176, 176, 176, 176, + 176, 176, 176, 43, 176, 105, 176, 176, 176, 176, + 176, 176, 176, 176, 60, 176, 176, 176, 176, 176, + 176, 75, 176, 161, 176, 169, 114, 156, 171, 176, + 176, 176, 176, 176, 176, 176, 176, 155, 176, 176, + 176, 176, 176, 111, 95, 176, 176, 163, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 176, 176, 80, + + 62, 176, 176, 176, 176, 112, 176, 176, 176, 176, + 173, 176, 176, 90, 176, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 94, 176, 176, 176, 47, + 176, 176, 176, 78, 176, 176, 176, 61, 176, 176, + 117, 176, 176, 176, 167, 176, 176, 176, 97, 176, + 176, 55, 176, 176, 176, 176, 176, 176, 176, 176, + 176, 51, 176, 176, 176, 176, 142, 176, 176, 98, + 176, 176, 176, 176, 176, 93, 176, 176, 176, 176, + 33, 32, 176, 176, 46, 176, 176, 176, 157, 176, + 103, 159, 91, 137, 176, 145, 176, 176, 176, 77, - 49, 107, 175, 153, 101, 50, 29, 157, 0 + 48, 176, 176, 176, 176, 176, 176, 106, 176, 176, + 49, 107, 176, 154, 101, 50, 29, 158, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -572,132 +573,133 @@ 6, 6, 6, 6, 6, 6, 6, 6, 6 } ; -static yyconst flex_int16_t yy_base[1016] = +static yyconst flex_int16_t yy_base[1026] = { 0, - 0, 0, 1234, 1235, 58, 1230, 0, 59, 0, 88, - 114, 54, 162, 51, 1235, 137, 1212, 59, 46, 130, + 0, 0, 1244, 1245, 58, 1240, 0, 59, 0, 88, + 114, 54, 162, 51, 1245, 137, 1222, 59, 46, 130, 200, 182, 184, 172, 213, 235, 47, 170, 226, 144, - 202, 169, 61, 239, 276, 223, 245, 242, 251, 168, - 60, 238, 151, 85, 1228, 0, 1224, 152, 0, 0, - 32, 1187, 157, 209, 1186, 1189, 1188, 1179, 180, 1176, - 1168, 234, 1184, 204, 1183, 0, 1162, 1235, 330, 245, - 340, 203, 1197, 1160, 1183, 248, 250, 288, 1174, 1179, - 1161, 258, 249, 273, 1165, 1164, 1173, 255, 335, 1176, - 277, 310, 311, 315, 1173, 1157, 1171, 340, 1161, 1165, - - 1169, 1156, 1168, 1146, 1166, 0, 1146, 1164, 287, 1139, - 1156, 309, 1143, 1141, 1147, 1145, 1152, 1151, 0, 1142, - 345, 1142, 1134, 1149, 1139, 337, 1140, 345, 1139, 1143, - 350, 1147, 1144, 257, 344, 1135, 1144, 290, 1128, 1137, - 1137, 1123, 1122, 1123, 1124, 1235, 328, 1134, 1116, 1129, - 1132, 301, 1112, 1129, 1119, 1116, 1117, 1127, 1120, 1119, - 351, 1120, 358, 1109, 1122, 1119, 355, 1103, 1106, 1149, - 1235, 402, 0, 0, 1127, 1138, 1098, 1112, 1103, 1106, - 1104, 1103, 1109, 1098, 1099, 1107, 1106, 0, 1102, 1084, - 1100, 1077, 1096, 359, 1099, 1079, 1095, 1085, 1080, 1083, - - 376, 1075, 1075, 1077, 1086, 1081, 122, 1088, 1076, 1082, - 1082, 1080, 1081, 0, 1076, 1067, 1061, 389, 1079, 1075, - 0, 0, 1077, 1072, 1074, 1054, 1055, 1068, 1061, 1062, - 377, 0, 0, 0, 0, 1070, 1063, 1062, 1048, 1063, - 1059, 1064, 1059, 1057, 0, 1040, 1038, 0, 373, 1050, - 1052, 378, 1054, 1037, 1050, 1054, 1035, 375, 1038, 1051, - 1033, 1076, 1040, 1039, 1046, 1024, 1032, 1027, 1023, 1023, - 1028, 1034, 1022, 1030, 1035, 0, 1014, 1032, 1015, 1021, - 1022, 1027, 1025, 1007, 1008, 1017, 1016, 1007, 0, 0, - 1003, 1014, 1016, 1006, 0, 386, 1006, 1013, 1010, 1008, - - 1010, 1003, 393, 1002, 0, 0, 1005, 986, 1001, 996, - 1008, 1007, 981, 1004, 999, 978, 984, 985, 988, 0, - 0, 0, 999, 980, 992, 993, 0, 990, 0, 0, - 0, 976, 990, 0, 984, 0, 976, 971, 984, 970, - 986, 973, 973, 970, 974, 979, 958, 971, 970, 973, - 968, 970, 0, 957, 956, 968, 963, 962, 950, 960, - 957, 947, 961, 945, 0, 383, 953, 957, 961, 952, - 947, 946, 0, 953, 949, 949, 955, 954, 948, 927, - 0, 933, 0, 945, 946, 928, 932, 934, 944, 931, - 938, 0, 924, 932, 920, 933, 925, 946, 954, 910, - - 921, 917, 918, 0, 906, 916, 924, 914, 908, 395, - 913, 910, 919, 904, 0, 922, 907, 920, 902, 914, - 917, 940, 899, 898, 0, 893, 887, 908, 909, 891, - 0, 0, 905, 882, 901, 890, 901, 883, 0, 895, - 900, 888, 879, 878, 893, 896, 883, 887, 874, 880, - 882, 868, 884, 888, 875, 879, 0, 873, 879, 385, - 0, 857, 874, 880, 875, 854, 866, 863, 861, 859, - 860, 868, 0, 392, 868, 855, 854, 868, 0, 843, - 859, 851, 864, 857, 862, 843, 856, 853, 0, 834, - 842, 867, 875, 849, 849, 852, 832, 404, 850, 838, - - 845, 0, 833, 842, 837, 844, 843, 840, 821, 404, - 840, 835, 820, 829, 829, 820, 819, 814, 824, 821, - 816, 810, 810, 828, 0, 826, 806, 824, 0, 819, - 816, 817, 821, 811, 804, 809, 812, 802, 796, 809, - 801, 807, 807, 794, 804, 794, 802, 802, 803, 788, - 788, 0, 782, 776, 800, 0, 792, 794, 792, 776, - 783, 775, 774, 783, 775, 770, 769, 0, 786, 767, - 761, 780, 777, 764, 778, 767, 780, 774, 787, 777, - 767, 761, 756, 764, 763, 762, 750, 753, 759, 753, - 744, 753, 757, 759, 742, 748, 759, 744, 738, 743, - - 740, 737, 753, 429, 742, 743, 736, 745, 735, 743, - 738, 741, 741, 735, 723, 728, 736, 728, 730, 723, - 0, 724, 0, 0, 736, 0, 730, 0, 729, 729, - 0, 731, 0, 0, 728, 0, 716, 728, 709, 716, - 0, 721, 706, 715, 707, 706, 705, 702, 708, 709, - 712, 704, 706, 714, 699, 707, 711, 705, 708, 697, - 675, 0, 674, 674, 662, 680, 54, 136, 192, 262, - 0, 402, 408, 408, 413, 414, 415, 406, 0, 408, - 422, 415, 424, 417, 0, 413, 442, 448, 428, 416, - 418, 408, 428, 435, 429, 423, 433, 425, 435, 440, - - 434, 0, 439, 430, 444, 444, 0, 445, 439, 429, - 0, 445, 0, 0, 447, 0, 472, 450, 0, 445, - 446, 0, 454, 442, 458, 444, 446, 458, 461, 455, - 462, 463, 446, 463, 488, 454, 465, 0, 458, 471, - 0, 468, 456, 461, 467, 474, 459, 0, 461, 462, - 477, 478, 468, 482, 485, 482, 504, 508, 480, 476, - 491, 0, 483, 485, 480, 492, 479, 491, 495, 487, - 496, 0, 502, 496, 495, 484, 487, 486, 0, 502, - 0, 508, 510, 511, 503, 499, 506, 512, 509, 514, - 506, 515, 512, 501, 502, 518, 0, 521, 0, 507, - - 507, 0, 523, 0, 522, 525, 0, 0, 512, 517, - 0, 519, 522, 522, 521, 0, 0, 517, 538, 527, - 533, 540, 537, 542, 526, 0, 0, 534, 541, 546, - 533, 544, 530, 544, 0, 534, 0, 533, 541, 542, - 536, 557, 557, 554, 549, 0, 546, 557, 562, 544, - 558, 548, 0, 562, 0, 563, 0, 0, 0, 0, - 563, 570, 566, 558, 568, 556, 572, 572, 0, 559, - 554, 560, 556, 577, 0, 579, 561, 0, 566, 577, - 582, 583, 574, 575, 572, 588, 574, 569, 576, 0, - 0, 592, 578, 589, 594, 0, 596, 586, 596, 600, - - 0, 601, 600, 0, 586, 586, 601, 591, 590, 596, - 588, 609, 601, 596, 604, 0, 614, 615, 616, 0, - 600, 614, 604, 0, 619, 605, 613, 0, 617, 614, - 0, 613, 625, 626, 0, 619, 628, 629, 0, 617, - 616, 0, 619, 633, 621, 639, 631, 637, 638, 631, - 640, 0, 628, 629, 647, 629, 0, 629, 629, 0, - 636, 641, 635, 650, 647, 0, 639, 653, 652, 640, - 0, 0, 645, 643, 0, 658, 657, 664, 0, 657, - 0, 0, 0, 0, 652, 0, 667, 664, 669, 0, - 0, 670, 667, 666, 671, 661, 663, 0, 670, 665, - - 0, 0, 674, 0, 0, 0, 0, 0, 1235, 710, - 715, 717, 722, 728, 734 + 202, 169, 61, 239, 276, 223, 259, 242, 228, 168, + 60, 248, 151, 85, 1238, 0, 1234, 152, 0, 0, + 32, 1197, 157, 242, 1196, 1199, 1198, 1189, 180, 1186, + 1178, 237, 1194, 204, 1193, 0, 1172, 1245, 330, 225, + 340, 203, 1207, 1170, 1193, 252, 245, 267, 1184, 1189, + 1171, 284, 268, 266, 1175, 1174, 1183, 291, 335, 1186, + 314, 292, 336, 314, 1183, 1167, 1181, 315, 1171, 1175, + + 1179, 1166, 1178, 1156, 1176, 0, 1156, 1174, 287, 1149, + 1166, 251, 1153, 1151, 1157, 1155, 1162, 1161, 0, 1161, + 1151, 345, 1151, 1143, 1158, 1148, 347, 1149, 346, 1148, + 1152, 351, 1156, 1153, 265, 344, 1144, 1153, 352, 1137, + 1146, 1146, 1132, 1131, 1132, 1133, 1245, 226, 1143, 1125, + 1138, 1141, 356, 1121, 1138, 1128, 1125, 1126, 1136, 1129, + 1128, 357, 1129, 361, 1118, 1131, 1128, 355, 1112, 1115, + 1158, 1245, 406, 0, 0, 1136, 1147, 1107, 1121, 1112, + 1115, 1113, 1112, 1118, 1107, 1108, 1116, 1115, 0, 1111, + 1093, 1109, 1086, 1105, 364, 1108, 1088, 1104, 1094, 1089, + + 1092, 380, 1084, 1084, 1086, 1095, 1090, 122, 1097, 1085, + 1091, 1091, 1089, 1090, 0, 1085, 1076, 1070, 295, 1088, + 1084, 0, 0, 1086, 1081, 1083, 1063, 1064, 1064, 1076, + 1069, 1070, 381, 0, 0, 0, 0, 1078, 1071, 1070, + 1056, 1071, 1067, 1072, 1067, 1065, 0, 1048, 1046, 0, + 377, 1058, 1060, 369, 1062, 1045, 1058, 1062, 1043, 381, + 1046, 1059, 1041, 1084, 1048, 1047, 1054, 1032, 1040, 1035, + 1031, 1031, 1036, 1042, 1030, 1038, 1043, 0, 1022, 1040, + 1023, 1029, 1030, 1035, 1033, 1015, 1016, 1025, 1024, 1015, + 0, 0, 1011, 1022, 1024, 1014, 0, 306, 1014, 1021, + + 1018, 1016, 1018, 1011, 397, 1010, 0, 0, 1013, 994, + 1009, 1004, 1016, 1015, 989, 1012, 1007, 986, 992, 993, + 996, 0, 0, 0, 1007, 988, 1000, 1001, 0, 998, + 0, 0, 0, 984, 998, 0, 992, 0, 984, 979, + 992, 984, 977, 993, 980, 980, 977, 981, 986, 965, + 978, 977, 980, 975, 977, 0, 964, 963, 975, 970, + 969, 957, 967, 964, 954, 968, 952, 0, 387, 960, + 964, 968, 959, 954, 953, 0, 960, 956, 956, 962, + 961, 955, 934, 0, 940, 0, 952, 953, 935, 939, + 941, 951, 938, 945, 0, 931, 939, 927, 940, 932, + + 953, 961, 917, 928, 924, 925, 0, 913, 923, 931, + 921, 915, 399, 920, 917, 926, 911, 0, 929, 914, + 927, 909, 921, 924, 947, 906, 905, 0, 900, 894, + 915, 916, 898, 0, 0, 912, 889, 908, 897, 908, + 890, 908, 0, 901, 906, 894, 885, 884, 899, 902, + 889, 893, 880, 886, 888, 874, 890, 894, 881, 885, + 0, 879, 885, 389, 0, 863, 880, 886, 881, 860, + 872, 869, 867, 865, 866, 874, 0, 396, 874, 861, + 860, 874, 0, 849, 865, 857, 870, 863, 868, 849, + 862, 859, 0, 840, 848, 873, 881, 855, 855, 858, + + 838, 408, 856, 844, 851, 0, 839, 848, 843, 850, + 849, 846, 827, 404, 846, 841, 826, 835, 835, 826, + 825, 820, 830, 827, 822, 816, 816, 834, 0, 832, + 812, 830, 0, 805, 824, 821, 822, 826, 816, 809, + 814, 817, 807, 801, 814, 806, 812, 812, 799, 809, + 799, 807, 807, 808, 793, 793, 0, 787, 781, 805, + 0, 797, 799, 797, 781, 788, 780, 779, 788, 780, + 775, 774, 0, 791, 772, 766, 785, 782, 769, 783, + 772, 785, 779, 792, 782, 772, 766, 761, 769, 768, + 767, 755, 758, 764, 758, 749, 758, 762, 764, 747, + + 753, 764, 749, 743, 748, 745, 742, 758, 433, 747, + 748, 741, 750, 740, 748, 743, 746, 746, 740, 728, + 747, 732, 740, 732, 734, 727, 0, 728, 0, 0, + 740, 0, 734, 0, 733, 733, 0, 735, 0, 0, + 732, 0, 720, 732, 713, 720, 0, 725, 710, 719, + 711, 710, 709, 706, 712, 713, 716, 708, 710, 718, + 690, 692, 696, 687, 690, 46, 139, 0, 323, 372, + 375, 397, 404, 396, 408, 400, 0, 421, 417, 415, + 420, 421, 422, 413, 0, 415, 429, 422, 431, 424, + 0, 420, 449, 455, 435, 423, 425, 415, 435, 442, + + 436, 430, 440, 432, 442, 445, 448, 442, 0, 447, + 438, 452, 452, 0, 453, 447, 437, 0, 453, 0, + 0, 455, 0, 480, 458, 0, 453, 454, 0, 462, + 450, 466, 452, 454, 466, 469, 463, 470, 471, 454, + 471, 496, 462, 473, 0, 466, 479, 0, 476, 464, + 469, 475, 482, 467, 0, 469, 470, 485, 486, 476, + 490, 493, 490, 512, 516, 488, 484, 499, 0, 491, + 493, 488, 500, 487, 499, 503, 504, 496, 505, 0, + 511, 505, 504, 493, 496, 495, 0, 511, 0, 517, + 519, 520, 512, 508, 515, 521, 518, 523, 515, 524, + + 521, 510, 511, 527, 0, 530, 0, 516, 516, 0, + 532, 0, 531, 534, 0, 0, 521, 526, 0, 528, + 531, 531, 530, 0, 0, 526, 547, 536, 542, 549, + 546, 551, 535, 0, 0, 543, 540, 551, 556, 543, + 554, 540, 554, 0, 544, 0, 543, 551, 552, 546, + 567, 567, 564, 559, 0, 556, 567, 572, 554, 568, + 558, 0, 572, 0, 573, 0, 0, 0, 0, 573, + 580, 576, 568, 578, 566, 582, 582, 0, 569, 564, + 570, 566, 587, 0, 0, 589, 571, 0, 576, 587, + 592, 593, 584, 585, 582, 598, 584, 579, 586, 0, + + 0, 602, 588, 599, 604, 0, 606, 596, 606, 610, + 0, 611, 610, 0, 596, 596, 611, 601, 600, 606, + 598, 619, 611, 606, 614, 0, 624, 625, 626, 0, + 610, 624, 614, 0, 629, 615, 623, 0, 627, 624, + 0, 623, 635, 636, 0, 629, 638, 639, 0, 627, + 626, 0, 629, 643, 631, 649, 641, 647, 648, 641, + 650, 0, 638, 639, 657, 639, 0, 639, 639, 0, + 646, 651, 645, 660, 657, 0, 649, 663, 662, 650, + 0, 0, 655, 653, 0, 668, 667, 674, 0, 667, + 0, 0, 0, 0, 662, 0, 677, 674, 679, 0, + + 0, 680, 677, 676, 681, 671, 673, 0, 680, 675, + 0, 0, 684, 0, 0, 0, 0, 0, 1245, 720, + 725, 727, 732, 738, 744 } ; -static yyconst flex_int16_t yy_def[1016] = +static yyconst flex_int16_t yy_def[1026] = { 0, - 1009, 1, 1009, 1009, 1009, 1009, 1010, 1011, 1012, 1009, - 10, 1010, 11, 13, 1009, 13, 11, 11, 11, 11, + 1019, 1, 1019, 1019, 1019, 1019, 1020, 1021, 1022, 1019, + 10, 1020, 11, 13, 1019, 13, 11, 11, 11, 11, 13, 13, 13, 13, 13, 13, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 1009, 1009, 1010, 1013, 1013, 1012, 11, + 11, 11, 11, 1019, 1019, 1020, 1023, 1023, 1022, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 1009, 1014, 13, - 11, 1009, 11, 11, 11, 13, 13, 13, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 1019, 1024, 13, + 11, 1019, 11, 11, 11, 13, 13, 13, 11, 11, 11, 13, 11, 11, 11, 11, 11, 11, 13, 11, 11, 13, 13, 13, 11, 11, 11, 13, 11, 11, @@ -705,20 +707,20 @@ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 11, 11, 1009, 1009, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 1019, 1019, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 1015, - 1009, 1014, 71, 1010, 11, 11, 11, 11, 11, 11, + 1025, 1019, 1024, 71, 1020, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 13, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 13, 11, 11, 11, 11, 11, - 13, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 13, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 11, 1013, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 1023, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, @@ -800,11 +802,12 @@ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 11, 0, 1009, - 1009, 1009, 1009, 1009, 1009 + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 0, 1019, + 1019, 1019, 1019, 1019, 1019 } ; -static yyconst flex_int16_t yy_nxt[1295] = +static yyconst flex_int16_t yy_nxt[1305] = { 0, 4, 5, 6, 5, 7, 8, 4, 9, 10, 11, 12, 13, 14, 14, 14, 14, 14, 14, 14, 4, @@ -814,48 +817,48 @@ 36, 37, 38, 39, 40, 41, 42, 17, 43, 44, 68, 44, 47, 47, 69, 72, 72, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 72, 72, - 72, 50, 148, 74, 102, 149, 44, 73, 44, 740, - 47, 47, 46, 143, 115, 49, 50, 50, 46, 50, + 72, 50, 149, 74, 102, 150, 44, 73, 44, 741, + 47, 47, 46, 144, 115, 49, 50, 50, 46, 50, 50, 50, 50, 50, 50, 50, 50, 50, 116, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 46, 50, 51, 52, 50, 53, 54, 55, 56, 57, 58, 50, 50, 59, 50, 60, 61, 62, 50, 63, 64, 50, 50, 65, 66, 50, 50, 67, 50, 50, 72, - 50, 50, 50, 50, 50, 50, 72, 146, 50, 320, - 50, 50, 50, 72, 50, 50, 321, 50, 50, 50, - 72, 147, 50, 70, 70, 70, 70, 70, 70, 70, + 50, 50, 50, 50, 50, 50, 72, 147, 50, 322, + 50, 50, 50, 72, 50, 50, 323, 50, 50, 50, + 72, 148, 50, 70, 70, 70, 70, 70, 70, 70, 70, 110, 75, 70, 70, 70, 70, 72, 72, 72, - 741, 72, 71, 50, 151, 70, 70, 70, 70, 70, + 742, 72, 71, 50, 152, 70, 70, 70, 70, 70, - 70, 72, 50, 72, 113, 142, 114, 103, 145, 89, - 152, 104, 50, 174, 50, 105, 82, 159, 71, 72, - 90, 72, 83, 84, 87, 91, 85, 160, 50, 86, - 50, 88, 72, 76, 174, 77, 742, 78, 50, 111, - 50, 166, 72, 50, 79, 72, 92, 153, 93, 112, - 80, 94, 167, 81, 72, 154, 50, 72, 72, 95, - 131, 72, 106, 96, 72, 50, 107, 163, 98, 97, - 72, 108, 109, 117, 132, 50, 99, 118, 50, 144, - 50, 184, 133, 100, 164, 119, 101, 140, 50, 134, - 247, 50, 138, 135, 120, 72, 136, 137, 178, 139, - - 185, 50, 141, 192, 50, 193, 50, 248, 183, 121, - 198, 186, 187, 122, 50, 743, 123, 124, 50, 188, - 125, 126, 199, 253, 127, 216, 128, 129, 217, 130, - 170, 170, 171, 170, 267, 170, 170, 170, 262, 179, - 50, 50, 220, 254, 50, 50, 268, 201, 221, 170, - 170, 173, 173, 173, 173, 173, 173, 173, 173, 262, - 200, 173, 173, 173, 173, 50, 50, 50, 202, 194, - 50, 50, 236, 173, 173, 173, 173, 173, 173, 195, - 229, 230, 239, 243, 277, 206, 196, 249, 250, 50, - 237, 50, 240, 280, 281, 231, 50, 278, 285, 286, - - 331, 244, 170, 170, 171, 170, 50, 170, 170, 170, - 343, 357, 307, 361, 344, 50, 368, 463, 402, 464, - 549, 170, 170, 403, 358, 410, 369, 314, 362, 345, - 503, 504, 50, 505, 411, 744, 585, 412, 550, 562, - 332, 563, 586, 687, 597, 688, 745, 413, 598, 746, - 747, 748, 749, 750, 751, 752, 753, 754, 755, 756, + 70, 72, 50, 72, 113, 143, 114, 103, 146, 89, + 153, 104, 50, 175, 50, 105, 82, 160, 71, 72, + 90, 72, 83, 84, 87, 91, 85, 161, 50, 86, + 50, 88, 72, 76, 175, 77, 264, 78, 50, 111, + 50, 167, 72, 50, 79, 72, 92, 72, 93, 112, + 80, 94, 168, 81, 72, 50, 50, 264, 72, 95, + 132, 72, 106, 96, 141, 50, 107, 72, 98, 97, + 164, 108, 109, 117, 133, 50, 99, 118, 72, 142, + 154, 50, 50, 100, 221, 119, 101, 165, 155, 145, + 222, 50, 139, 120, 121, 72, 134, 50, 249, 140, + + 185, 50, 179, 135, 187, 188, 333, 136, 50, 122, + 137, 138, 189, 123, 50, 250, 124, 125, 180, 186, + 126, 127, 50, 50, 128, 217, 129, 130, 218, 131, + 171, 171, 172, 171, 184, 171, 171, 171, 405, 193, + 50, 194, 201, 406, 50, 50, 334, 199, 50, 171, + 171, 174, 174, 174, 174, 174, 174, 174, 174, 200, + 207, 174, 174, 174, 174, 50, 50, 203, 743, 195, + 50, 50, 202, 174, 174, 174, 174, 174, 174, 196, + 231, 232, 238, 241, 245, 255, 197, 251, 252, 269, + 279, 50, 50, 242, 50, 233, 282, 283, 287, 288, + + 239, 270, 246, 280, 364, 256, 171, 171, 172, 171, + 50, 171, 171, 171, 346, 360, 744, 309, 347, 365, + 50, 467, 371, 468, 554, 171, 171, 745, 361, 413, + 746, 316, 372, 348, 507, 508, 50, 509, 414, 747, + 590, 415, 555, 567, 602, 568, 591, 693, 603, 694, + 748, 416, 749, 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, @@ -863,17 +866,17 @@ 797, 798, 799, 800, 801, 802, 803, 804, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, 816, - 817, 818, 819, 820, 821, 822, 824, 825, 823, 826, - 827, 828, 829, 830, 831, 832, 833, 834, 835, 836, - 837, 838, 839, 840, 841, 842, 843, 845, 846, 844, - 847, 848, 849, 850, 851, 852, 853, 854, 855, 856, + 817, 818, 819, 820, 821, 822, 823, 824, 825, 826, + 827, 828, 829, 830, 832, 833, 831, 834, 835, 836, + 837, 838, 839, 840, 841, 842, 843, 844, 845, 846, + 847, 848, 849, 850, 851, 852, 854, 855, 853, 856, 857, 858, 859, 860, 861, 862, 863, 864, 865, 866, 867, 868, 869, 870, 871, 872, 873, 874, 875, 876, 877, 878, 879, 880, 881, 882, 883, 884, 885, 886, 887, 888, 889, 890, 891, 892, 893, 894, 895, 896, - 897, 899, 900, 901, 898, 902, 903, 904, 905, 906, - 907, 908, 909, 910, 911, 912, 913, 914, 915, 916, + 897, 898, 899, 900, 901, 902, 903, 904, 905, 906, + 907, 909, 910, 911, 908, 912, 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, @@ -884,74 +887,75 @@ 987, 988, 989, 990, 991, 992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, - 1007, 1008, 46, 739, 738, 46, 48, 48, 737, 736, - 48, 49, 49, 47, 47, 47, 735, 47, 172, 172, - 172, 172, 172, 172, 170, 170, 170, 170, 170, 170, - 734, 733, 732, 731, 730, 729, 728, 727, 726, 725, - 724, 723, 722, 721, 720, 719, 718, 717, 716, 715, - 714, 713, 712, 711, 710, 709, 708, 707, 706, 705, - 704, 703, 702, 701, 700, 699, 698, 697, 696, 695, - 694, 693, 692, 691, 690, 689, 686, 685, 684, 683, - 682, 681, 680, 679, 678, 677, 676, 675, 674, 673, - - 672, 671, 670, 669, 668, 667, 666, 665, 664, 663, - 662, 661, 660, 659, 658, 657, 656, 655, 654, 653, - 652, 651, 650, 649, 648, 647, 646, 645, 644, 643, - 642, 641, 640, 639, 638, 637, 636, 635, 634, 633, - 632, 631, 630, 629, 628, 627, 626, 625, 624, 623, - 622, 621, 620, 619, 618, 617, 616, 615, 614, 613, - 612, 611, 610, 609, 608, 607, 606, 605, 604, 603, - 602, 601, 600, 599, 596, 595, 594, 593, 592, 591, - 590, 589, 588, 587, 584, 583, 582, 581, 580, 579, - 578, 577, 576, 575, 574, 573, 572, 571, 570, 569, - - 568, 567, 566, 565, 564, 561, 560, 559, 558, 557, - 556, 555, 554, 553, 552, 551, 548, 547, 546, 545, - 544, 543, 542, 541, 540, 539, 538, 537, 536, 535, - 534, 533, 532, 531, 530, 529, 528, 527, 526, 525, - 524, 523, 522, 521, 520, 519, 518, 517, 516, 515, - 514, 513, 512, 511, 510, 509, 508, 507, 506, 502, - 501, 500, 499, 498, 497, 496, 495, 494, 493, 492, - 491, 490, 489, 488, 487, 486, 485, 484, 483, 482, - 481, 480, 479, 478, 477, 476, 475, 474, 473, 472, - 471, 470, 469, 468, 467, 466, 465, 462, 461, 460, - - 459, 458, 457, 456, 455, 454, 453, 452, 451, 450, - 449, 448, 447, 446, 445, 444, 443, 442, 441, 440, - 439, 438, 437, 436, 435, 434, 433, 432, 431, 430, - 429, 428, 427, 426, 425, 424, 423, 422, 421, 420, - 419, 418, 417, 416, 415, 414, 409, 408, 407, 406, - 405, 404, 401, 400, 399, 398, 397, 396, 395, 394, - 393, 392, 391, 390, 389, 388, 387, 386, 385, 384, - 383, 382, 381, 380, 379, 378, 377, 376, 375, 374, - 373, 1009, 372, 371, 370, 367, 366, 365, 364, 363, - 360, 359, 356, 355, 354, 353, 352, 351, 350, 349, - - 348, 347, 346, 342, 341, 340, 339, 338, 337, 336, - 335, 334, 333, 330, 329, 328, 327, 326, 325, 324, - 323, 322, 319, 318, 317, 316, 315, 313, 312, 311, - 310, 309, 308, 306, 305, 304, 303, 302, 301, 300, - 299, 298, 297, 296, 295, 294, 293, 292, 291, 290, - 289, 171, 288, 287, 284, 283, 282, 279, 276, 275, - 274, 273, 272, 271, 270, 269, 266, 265, 264, 263, - 261, 260, 259, 258, 257, 256, 255, 252, 251, 246, - 245, 242, 241, 238, 235, 234, 233, 232, 228, 227, - 226, 225, 224, 223, 222, 219, 218, 215, 214, 213, - - 212, 211, 210, 209, 208, 207, 205, 204, 203, 197, - 191, 190, 189, 182, 181, 180, 177, 176, 175, 169, - 168, 165, 162, 161, 158, 157, 156, 155, 150, 146, - 45, 72, 45, 1009, 3, 1009, 1009, 1009, 1009, 1009, - 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, - 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, - 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, - 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, - 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, - 1009, 1009, 1009, 1009 + 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, + 1017, 1018, 46, 740, 739, 46, 48, 48, 738, 737, + 48, 49, 49, 47, 47, 47, 736, 47, 173, 173, + 173, 173, 173, 173, 171, 171, 171, 171, 171, 171, + 735, 734, 733, 732, 731, 730, 729, 728, 727, 726, + 725, 724, 723, 722, 721, 720, 719, 718, 717, 716, + 715, 714, 713, 712, 711, 710, 709, 708, 707, 706, + 705, 704, 703, 702, 701, 700, 699, 698, 697, 696, + 695, 692, 691, 690, 689, 688, 687, 686, 685, 684, + + 683, 682, 681, 680, 679, 678, 677, 676, 675, 674, + 673, 672, 671, 670, 669, 668, 667, 666, 665, 664, + 663, 662, 661, 660, 659, 658, 657, 656, 655, 654, + 653, 652, 651, 650, 649, 648, 647, 646, 645, 644, + 643, 642, 641, 640, 639, 638, 637, 636, 635, 634, + 633, 632, 631, 630, 629, 628, 627, 626, 625, 624, + 623, 622, 621, 620, 619, 618, 617, 616, 615, 614, + 613, 612, 611, 610, 609, 608, 607, 606, 605, 604, + 601, 600, 599, 598, 597, 596, 595, 594, 593, 592, + 589, 588, 587, 586, 585, 584, 583, 582, 581, 580, + 579, 578, 577, 576, 575, 574, 573, 572, 571, 570, + 569, 566, 565, 564, 563, 562, 561, 560, 559, 558, + 557, 556, 553, 552, 551, 550, 549, 548, 547, 546, + 545, 544, 543, 542, 541, 540, 539, 538, 537, 536, + 535, 534, 533, 532, 531, 530, 529, 528, 527, 526, + 525, 524, 523, 522, 521, 520, 519, 518, 517, 516, + 515, 514, 513, 512, 511, 510, 506, 505, 504, 503, + 502, 501, 500, 499, 498, 497, 496, 495, 494, 493, + 492, 491, 490, 489, 488, 487, 486, 485, 484, 483, + 482, 481, 480, 479, 478, 477, 476, 475, 474, 473, + + 472, 471, 470, 469, 466, 465, 464, 463, 462, 461, + 460, 459, 458, 457, 456, 455, 454, 453, 452, 451, + 450, 449, 448, 447, 446, 445, 444, 443, 442, 441, + 440, 439, 438, 437, 436, 435, 434, 433, 432, 431, + 430, 429, 428, 427, 426, 425, 424, 423, 422, 421, + 420, 419, 418, 417, 412, 411, 410, 409, 408, 407, + 404, 403, 402, 401, 400, 399, 398, 397, 396, 395, + 394, 393, 392, 391, 390, 389, 388, 387, 386, 385, + 384, 383, 382, 381, 380, 379, 378, 377, 376, 1019, + 375, 374, 373, 370, 369, 368, 367, 366, 363, 362, + + 359, 358, 357, 356, 355, 354, 353, 352, 351, 350, + 349, 345, 344, 343, 342, 341, 340, 339, 338, 337, + 336, 335, 332, 331, 330, 329, 328, 327, 326, 325, + 324, 321, 320, 319, 318, 317, 315, 314, 313, 312, + 311, 310, 308, 307, 306, 305, 304, 303, 302, 301, + 300, 299, 298, 297, 296, 295, 294, 293, 292, 291, + 172, 290, 289, 286, 285, 284, 281, 278, 277, 276, + 275, 274, 273, 272, 271, 268, 267, 266, 265, 263, + 262, 261, 260, 259, 258, 257, 254, 253, 248, 247, + 244, 243, 240, 237, 236, 235, 234, 230, 229, 228, + + 227, 226, 225, 224, 223, 220, 219, 216, 215, 214, + 213, 212, 211, 210, 209, 208, 206, 205, 204, 198, + 192, 191, 190, 183, 182, 181, 178, 177, 176, 170, + 169, 166, 163, 162, 159, 158, 157, 156, 151, 147, + 45, 72, 45, 1019, 3, 1019, 1019, 1019, 1019, 1019, + 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, + 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, + 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, + 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, + 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, + + 1019, 1019, 1019, 1019 } ; -static yyconst flex_int16_t yy_chk[1295] = +static yyconst flex_int16_t yy_chk[1305] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -961,7 +965,7 @@ 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 12, 5, 8, 8, 12, 19, 27, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 18, 41, - 33, 14, 51, 19, 27, 51, 44, 18, 44, 667, + 33, 14, 51, 19, 27, 51, 44, 18, 44, 666, 8, 8, 10, 41, 33, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 14, 33, 10, @@ -969,136 +973,137 @@ 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 20, - 11, 11, 11, 11, 11, 11, 16, 48, 11, 207, - 11, 11, 11, 30, 11, 11, 207, 16, 11, 11, + 11, 11, 11, 11, 11, 11, 16, 48, 11, 208, + 11, 11, 11, 30, 11, 11, 208, 16, 11, 11, 43, 48, 11, 13, 13, 13, 13, 13, 13, 13, 13, 30, 20, 13, 13, 13, 13, 40, 32, 28, - 668, 24, 13, 16, 53, 13, 13, 13, 13, 13, + 667, 24, 13, 16, 53, 13, 13, 13, 13, 13, 13, 22, 24, 23, 32, 40, 32, 28, 43, 24, 53, 28, 22, 72, 23, 28, 22, 59, 13, 21, 24, 31, 22, 22, 23, 24, 22, 59, 24, 22, - 21, 23, 25, 21, 72, 21, 669, 21, 22, 31, - 23, 64, 36, 25, 21, 29, 25, 54, 25, 31, - 21, 25, 64, 21, 26, 54, 21, 42, 34, 25, - 36, 38, 29, 25, 37, 26, 29, 62, 26, 25, - 39, 29, 29, 34, 36, 70, 26, 34, 76, 42, - 77, 83, 37, 26, 62, 34, 26, 39, 82, 37, - 134, 26, 38, 37, 34, 35, 37, 37, 76, 38, - - 83, 70, 39, 88, 76, 88, 77, 134, 82, 35, - 91, 84, 84, 35, 82, 670, 35, 35, 78, 84, - 35, 35, 91, 138, 35, 109, 35, 35, 109, 35, - 69, 69, 69, 69, 152, 69, 69, 69, 147, 78, - 92, 93, 112, 138, 78, 94, 152, 93, 112, 69, - 69, 71, 71, 71, 71, 71, 71, 71, 71, 147, - 92, 71, 71, 71, 71, 89, 92, 93, 94, 89, - 98, 94, 126, 71, 71, 71, 71, 71, 71, 89, - 121, 121, 128, 131, 161, 98, 89, 135, 135, 194, - 126, 89, 128, 163, 163, 121, 98, 161, 167, 167, - - 218, 131, 172, 172, 172, 172, 201, 172, 172, 172, - 231, 249, 194, 252, 231, 194, 258, 366, 296, 366, - 460, 172, 172, 296, 249, 303, 258, 201, 252, 231, - 410, 410, 201, 410, 303, 672, 498, 303, 460, 474, - 218, 474, 498, 604, 510, 604, 673, 303, 510, 674, - 675, 676, 677, 678, 680, 681, 682, 683, 684, 686, - 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, - 697, 698, 699, 700, 701, 703, 704, 705, 706, 708, - 709, 710, 712, 715, 717, 718, 720, 721, 723, 724, - 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, - - 735, 736, 737, 739, 740, 742, 743, 744, 745, 746, - 747, 749, 750, 751, 752, 753, 754, 755, 756, 757, - 758, 759, 760, 761, 763, 764, 765, 766, 764, 767, - 768, 769, 770, 771, 773, 774, 775, 776, 777, 778, - 780, 782, 783, 784, 785, 786, 787, 788, 789, 787, - 790, 791, 792, 793, 794, 795, 796, 798, 800, 801, - 803, 805, 806, 809, 810, 812, 813, 814, 815, 818, - 819, 820, 821, 822, 823, 824, 825, 828, 829, 830, - 831, 832, 833, 834, 836, 838, 839, 840, 841, 842, - 843, 844, 845, 847, 848, 849, 850, 851, 852, 854, - - 856, 861, 862, 863, 856, 864, 865, 866, 867, 868, - 870, 871, 872, 873, 874, 876, 877, 879, 880, 881, - 882, 883, 884, 885, 886, 887, 888, 889, 892, 893, - 894, 895, 897, 898, 899, 900, 900, 902, 903, 905, - 906, 907, 908, 909, 910, 911, 912, 913, 914, 915, - 917, 918, 919, 921, 922, 923, 925, 926, 927, 929, - 930, 932, 933, 934, 936, 937, 938, 940, 941, 943, - 944, 945, 946, 947, 948, 949, 950, 951, 953, 954, - 955, 956, 958, 959, 961, 962, 963, 964, 965, 967, - 968, 969, 970, 973, 974, 976, 977, 978, 980, 985, - - 987, 988, 989, 992, 993, 994, 995, 996, 997, 999, - 1000, 1003, 1010, 666, 665, 1010, 1011, 1011, 664, 663, - 1011, 1012, 1012, 1013, 1013, 1013, 661, 1013, 1014, 1014, - 1014, 1014, 1014, 1014, 1015, 1015, 1015, 1015, 1015, 1015, + 21, 23, 25, 21, 72, 21, 148, 21, 22, 31, + 23, 64, 36, 25, 21, 29, 25, 39, 25, 31, + 21, 25, 64, 21, 26, 70, 21, 148, 34, 25, + 36, 38, 29, 25, 39, 26, 29, 42, 26, 25, + 62, 29, 29, 34, 36, 77, 26, 34, 37, 39, + 54, 70, 76, 26, 112, 34, 26, 62, 54, 42, + 112, 26, 38, 34, 34, 35, 37, 78, 135, 38, + + 83, 77, 76, 37, 84, 84, 219, 37, 76, 35, + 37, 37, 84, 35, 82, 135, 35, 35, 78, 83, + 35, 35, 92, 78, 35, 109, 35, 35, 109, 35, + 69, 69, 69, 69, 82, 69, 69, 69, 298, 88, + 82, 88, 92, 298, 94, 98, 219, 91, 92, 69, + 69, 71, 71, 71, 71, 71, 71, 71, 71, 91, + 98, 71, 71, 71, 71, 89, 93, 94, 669, 89, + 94, 98, 93, 71, 71, 71, 71, 71, 71, 89, + 122, 122, 127, 129, 132, 139, 89, 136, 136, 153, + 162, 89, 93, 129, 195, 122, 164, 164, 168, 168, + + 127, 153, 132, 162, 254, 139, 173, 173, 173, 173, + 202, 173, 173, 173, 233, 251, 670, 195, 233, 254, + 195, 369, 260, 369, 464, 173, 173, 671, 251, 305, + 672, 202, 260, 233, 413, 413, 202, 413, 305, 673, + 502, 305, 464, 478, 514, 478, 502, 609, 514, 609, + 674, 305, 675, 676, 678, 679, 680, 681, 682, 683, + 684, 686, 687, 688, 689, 690, 692, 693, 694, 695, + 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, + 706, 707, 708, 710, 711, 712, 713, 715, 716, 717, + 719, 722, 724, 725, 727, 728, 730, 731, 732, 733, + + 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, + 744, 746, 747, 749, 750, 751, 752, 753, 754, 756, + 757, 758, 759, 760, 761, 762, 763, 764, 765, 766, + 767, 768, 770, 771, 772, 773, 771, 774, 775, 776, + 777, 778, 779, 781, 782, 783, 784, 785, 786, 788, + 790, 791, 792, 793, 794, 795, 796, 797, 795, 798, + 799, 800, 801, 802, 803, 804, 806, 808, 809, 811, + 813, 814, 817, 818, 820, 821, 822, 823, 826, 827, + 828, 829, 830, 831, 832, 833, 836, 837, 838, 839, + 840, 841, 842, 843, 845, 847, 848, 849, 850, 851, + + 852, 853, 854, 856, 857, 858, 859, 860, 861, 863, + 865, 870, 871, 872, 865, 873, 874, 875, 876, 877, + 879, 880, 881, 882, 883, 886, 887, 889, 890, 891, + 892, 893, 894, 895, 896, 897, 898, 899, 902, 903, + 904, 905, 907, 908, 909, 910, 910, 912, 913, 915, + 916, 917, 918, 919, 920, 921, 922, 923, 924, 925, + 927, 928, 929, 931, 932, 933, 935, 936, 937, 939, + 940, 942, 943, 944, 946, 947, 948, 950, 951, 953, + 954, 955, 956, 957, 958, 959, 960, 961, 963, 964, + 965, 966, 968, 969, 971, 972, 973, 974, 975, 977, + + 978, 979, 980, 983, 984, 986, 987, 988, 990, 995, + 997, 998, 999, 1002, 1003, 1004, 1005, 1006, 1007, 1009, + 1010, 1013, 1020, 665, 664, 1020, 1021, 1021, 663, 662, + 1021, 1022, 1022, 1023, 1023, 1023, 661, 1023, 1024, 1024, + 1024, 1024, 1024, 1024, 1025, 1025, 1025, 1025, 1025, 1025, 660, 659, 658, 657, 656, 655, 654, 653, 652, 651, - 650, 649, 648, 647, 646, 645, 644, 643, 642, 640, - 639, 638, 637, 635, 632, 630, 629, 627, 625, 622, + 650, 649, 648, 646, 645, 644, 643, 641, 638, 636, + 635, 633, 631, 628, 626, 625, 624, 623, 622, 621, 620, 619, 618, 617, 616, 615, 614, 613, 612, 611, - 610, 609, 608, 607, 606, 605, 603, 602, 601, 600, - 599, 598, 597, 596, 595, 594, 593, 592, 591, 590, + 610, 608, 607, 606, 605, 604, 603, 602, 601, 600, + 599, 598, 597, 596, 595, 594, 593, 592, 591, 590, 589, 588, 587, 586, 585, 584, 583, 582, 581, 580, - 579, 578, 577, 576, 575, 574, 573, 572, 571, 570, - 569, 567, 566, 565, 564, 563, 562, 561, 560, 559, - 558, 557, 555, 554, 553, 551, 550, 549, 548, 547, + 579, 578, 577, 576, 575, 574, 572, 571, 570, 569, + 568, 567, 566, 565, 564, 563, 562, 560, 559, 558, + 556, 555, 554, 553, 552, 551, 550, 549, 548, 547, 546, 545, 544, 543, 542, 541, 540, 539, 538, 537, - 536, 535, 534, 533, 532, 531, 530, 528, 527, 526, + 536, 535, 534, 532, 531, 530, 528, 527, 526, 525, 524, 523, 522, 521, 520, 519, 518, 517, 516, 515, - 514, 513, 512, 511, 509, 508, 507, 506, 505, 504, - 503, 501, 500, 499, 497, 496, 495, 494, 493, 492, - 491, 490, 488, 487, 486, 485, 484, 483, 482, 481, + 513, 512, 511, 510, 509, 508, 507, 505, 504, 503, + 501, 500, 499, 498, 497, 496, 495, 494, 492, 491, - 480, 478, 477, 476, 475, 472, 471, 470, 469, 468, - 467, 466, 465, 464, 463, 462, 459, 458, 456, 455, + 490, 489, 488, 487, 486, 485, 484, 482, 481, 480, + 479, 476, 475, 474, 473, 472, 471, 470, 469, 468, + 467, 466, 463, 462, 460, 459, 458, 457, 456, 455, 454, 453, 452, 451, 450, 449, 448, 447, 446, 445, - 444, 443, 442, 441, 440, 438, 437, 436, 435, 434, - 433, 430, 429, 428, 427, 426, 424, 423, 422, 421, - 420, 419, 418, 417, 416, 414, 413, 412, 411, 409, - 408, 407, 406, 405, 403, 402, 401, 400, 399, 398, - 397, 396, 395, 394, 393, 391, 390, 389, 388, 387, - 386, 385, 384, 382, 380, 379, 378, 377, 376, 375, - 374, 372, 371, 370, 369, 368, 367, 364, 363, 362, + 444, 442, 441, 440, 439, 438, 437, 436, 433, 432, + 431, 430, 429, 427, 426, 425, 424, 423, 422, 421, + 420, 419, 417, 416, 415, 414, 412, 411, 410, 409, + 408, 406, 405, 404, 403, 402, 401, 400, 399, 398, + 397, 396, 394, 393, 392, 391, 390, 389, 388, 387, + 385, 383, 382, 381, 380, 379, 378, 377, 375, 374, - 361, 360, 359, 358, 357, 356, 355, 354, 352, 351, + 373, 372, 371, 370, 367, 366, 365, 364, 363, 362, + 361, 360, 359, 358, 357, 355, 354, 353, 352, 351, 350, 349, 348, 347, 346, 345, 344, 343, 342, 341, - 340, 339, 338, 337, 335, 333, 332, 328, 326, 325, - 324, 323, 319, 318, 317, 316, 315, 314, 313, 312, - 311, 310, 309, 308, 307, 304, 302, 301, 300, 299, - 298, 297, 294, 293, 292, 291, 288, 287, 286, 285, - 284, 283, 282, 281, 280, 279, 278, 277, 275, 274, + 340, 339, 337, 335, 334, 330, 328, 327, 326, 325, + 321, 320, 319, 318, 317, 316, 315, 314, 313, 312, + 311, 310, 309, 306, 304, 303, 302, 301, 300, 299, + 296, 295, 294, 293, 290, 289, 288, 287, 286, 285, + 284, 283, 282, 281, 280, 279, 277, 276, 275, 274, 273, 272, 271, 270, 269, 268, 267, 266, 265, 264, - 263, 262, 261, 260, 259, 257, 256, 255, 254, 253, - 251, 250, 247, 246, 244, 243, 242, 241, 240, 239, + 263, 262, 261, 259, 258, 257, 256, 255, 253, 252, - 238, 237, 236, 230, 229, 228, 227, 226, 225, 224, - 223, 220, 219, 217, 216, 215, 213, 212, 211, 210, - 209, 208, 206, 205, 204, 203, 202, 200, 199, 198, - 197, 196, 195, 193, 192, 191, 190, 189, 187, 186, + 249, 248, 246, 245, 244, 243, 242, 241, 240, 239, + 238, 232, 231, 230, 229, 228, 227, 226, 225, 224, + 221, 220, 218, 217, 216, 214, 213, 212, 211, 210, + 209, 207, 206, 205, 204, 203, 201, 200, 199, 198, + 197, 196, 194, 193, 192, 191, 190, 188, 187, 186, 185, 184, 183, 182, 181, 180, 179, 178, 177, 176, - 175, 170, 169, 168, 166, 165, 164, 162, 160, 159, - 158, 157, 156, 155, 154, 153, 151, 150, 149, 148, - 145, 144, 143, 142, 141, 140, 139, 137, 136, 133, - 132, 130, 129, 127, 125, 124, 123, 122, 120, 118, - 117, 116, 115, 114, 113, 111, 110, 108, 107, 105, + 171, 170, 169, 167, 166, 165, 163, 161, 160, 159, + 158, 157, 156, 155, 154, 152, 151, 150, 149, 146, + 145, 144, 143, 142, 141, 140, 138, 137, 134, 133, + 131, 130, 128, 126, 125, 124, 123, 121, 120, 118, + 117, 116, 115, 114, 113, 111, 110, 108, 107, 105, 104, 103, 102, 101, 100, 99, 97, 96, 95, 90, 87, 86, 85, 81, 80, 79, 75, 74, 73, 67, 65, 63, 61, 60, 58, 57, 56, 55, 52, 47, - 45, 17, 6, 3, 1009, 1009, 1009, 1009, 1009, 1009, - 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, - 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, - 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, - 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, - 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, 1009, - 1009, 1009, 1009, 1009 + 45, 17, 6, 3, 1019, 1019, 1019, 1019, 1019, 1019, + 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, + 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, + 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, + 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, + 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, 1019, + 1019, 1019, 1019, 1019 } ; -static yyconst flex_int16_t yy_rule_linenum[181] = +static yyconst flex_int16_t yy_rule_linenum[182] = { 0, 42, 43, 45, 48, 49, 50, 51, 52, 54, 55, 56, 58, 59, 60, 61, 62, 63, 65, 67, 68, @@ -1112,13 +1117,14 @@ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, - 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, + 170, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, - 231, 232, 233, 237, 238, 239, 240, 243, 244, 245 + 231, 232, 233, 234, 238, 239, 240, 241, 244, 245, + 246 } ; /* The intent behind this definition is that it'll catch @@ -1130,7 +1136,7 @@ #define YY_RESTORE_YY_MORE_OFFSET #line 1 "../s/cmdoptions.l" /****************************************************************************** -* Copyright 2015-2020 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1154,7 +1160,7 @@ typedef CO::BisonParser::token tok; #line 31 "../s/cmdoptions.l" # define YY_USER_ACTION yylloc->columns (yyleng); -#line 1158 "../bisonflex/cmdoptions.yy.cpp" +#line 1164 "../bisonflex/cmdoptions.yy.cpp" #define INITIAL 0 @@ -1320,7 +1326,7 @@ -#line 1324 "../bisonflex/cmdoptions.yy.cpp" +#line 1330 "../bisonflex/cmdoptions.yy.cpp" if ( !(yy_init) ) { @@ -1383,13 +1389,13 @@ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1010 ) + if ( yy_current_state >= 1020 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_current_state != 1009 ); + while ( yy_current_state != 1019 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -1408,12 +1414,12 @@ { if ( yy_act == 0 ) std::cerr << "--scanner backing up\n"; - else if ( yy_act < 181 ) + else if ( yy_act < 182 ) std::cerr << "--accepting rule at line " << yy_rule_linenum[yy_act] << "(\"" << yytext << "\")\n"; - else if ( yy_act == 181 ) - std::cerr << "--accepting default rule (\"" << yytext << "\")\n"; else if ( yy_act == 182 ) + std::cerr << "--accepting default rule (\"" << yytext << "\")\n"; + else if ( yy_act == 183 ) std::cerr << "--(end of buffer or a NUL)\n"; else std::cerr << "--EOF (start condition " << YY_START << ")\n"; @@ -1982,168 +1988,168 @@ YY_BREAK case 111: YY_RULE_SETUP -#line 171 "../s/cmdoptions.l" -return tok::H_BIF_AARCH32; +#line 170 "../s/cmdoptions.l" +return tok::HOVLCDO; YY_BREAK case 112: YY_RULE_SETUP #line 172 "../s/cmdoptions.l" -return tok::H_BIF_BIGENDIAN; +return tok::H_BIF_AARCH32; YY_BREAK case 113: YY_RULE_SETUP #line 173 "../s/cmdoptions.l" -return tok::H_BIF_BOOTCONFIG; +return tok::H_BIF_BIGENDIAN; YY_BREAK case 114: YY_RULE_SETUP #line 174 "../s/cmdoptions.l" -return tok::H_BIF_COPY; +return tok::H_BIF_BOOTCONFIG; YY_BREAK case 115: YY_RULE_SETUP #line 175 "../s/cmdoptions.l" -return tok::H_BIF_CORE; +return tok::H_BIF_COPY; YY_BREAK case 116: YY_RULE_SETUP #line 176 "../s/cmdoptions.l" -return tok::H_BIF_DELAY_HANDOFF; +return tok::H_BIF_CORE; YY_BREAK case 117: YY_RULE_SETUP #line 177 "../s/cmdoptions.l" -return tok::H_BIF_DELAY_LOAD; +return tok::H_BIF_DELAY_HANDOFF; YY_BREAK case 118: YY_RULE_SETUP #line 178 "../s/cmdoptions.l" -return tok::H_BIF_FILE; +return tok::H_BIF_DELAY_LOAD; YY_BREAK case 119: YY_RULE_SETUP #line 179 "../s/cmdoptions.l" -return tok::H_BIF_ID; +return tok::H_BIF_FILE; YY_BREAK case 120: YY_RULE_SETUP #line 180 "../s/cmdoptions.l" -return tok::H_BIF_IMAGE; +return tok::H_BIF_ID; YY_BREAK case 121: YY_RULE_SETUP #line 181 "../s/cmdoptions.l" -return tok::H_BIF_METAHDR; +return tok::H_BIF_IMAGE; YY_BREAK case 122: YY_RULE_SETUP #line 182 "../s/cmdoptions.l" -return tok::H_BIF_NAME; +return tok::H_BIF_METAHDR; YY_BREAK case 123: YY_RULE_SETUP #line 183 "../s/cmdoptions.l" -return tok::H_BIF_PARTITION; +return tok::H_BIF_NAME; YY_BREAK case 124: YY_RULE_SETUP #line 184 "../s/cmdoptions.l" -return tok::H_BIF_PARENTID; +return tok::H_BIF_PARTITION; YY_BREAK case 125: YY_RULE_SETUP #line 185 "../s/cmdoptions.l" -return tok::H_BIF_SLR; +return tok::H_BIF_PARENTID; YY_BREAK case 126: YY_RULE_SETUP #line 186 "../s/cmdoptions.l" -return tok::H_BIF_TYPE; +return tok::H_BIF_SLR; YY_BREAK case 127: YY_RULE_SETUP #line 187 "../s/cmdoptions.l" -return tok::H_BIF_KEYSRC; +return tok::H_BIF_TYPE; YY_BREAK case 128: YY_RULE_SETUP #line 188 "../s/cmdoptions.l" -return tok::H_BIF_INIT; +return tok::H_BIF_KEYSRC; YY_BREAK case 129: YY_RULE_SETUP #line 189 "../s/cmdoptions.l" -return tok::H_BIF_UDFBH; +return tok::H_BIF_INIT; YY_BREAK case 130: YY_RULE_SETUP #line 190 "../s/cmdoptions.l" -return tok::H_BIF_AES; +return tok::H_BIF_UDFBH; YY_BREAK case 131: YY_RULE_SETUP #line 191 "../s/cmdoptions.l" -return tok::H_BIF_PPK; +return tok::H_BIF_AES; YY_BREAK case 132: YY_RULE_SETUP #line 192 "../s/cmdoptions.l" -return tok::H_BIF_PSK; +return tok::H_BIF_PPK; YY_BREAK case 133: YY_RULE_SETUP #line 193 "../s/cmdoptions.l" -return tok::H_BIF_SPK; +return tok::H_BIF_PSK; YY_BREAK case 134: YY_RULE_SETUP #line 194 "../s/cmdoptions.l" -return tok::H_BIF_SSK; +return tok::H_BIF_SPK; YY_BREAK case 135: YY_RULE_SETUP #line 195 "../s/cmdoptions.l" -return tok::H_BIF_SPKSIGN; +return tok::H_BIF_SSK; YY_BREAK case 136: YY_RULE_SETUP #line 196 "../s/cmdoptions.l" -return tok::H_BIF_HDRSIGN; +return tok::H_BIF_SPKSIGN; YY_BREAK case 137: YY_RULE_SETUP #line 197 "../s/cmdoptions.l" -return tok::H_BIF_BOOTIMAGE; +return tok::H_BIF_HDRSIGN; YY_BREAK case 138: YY_RULE_SETUP #line 198 "../s/cmdoptions.l" -return tok::H_BIF_BL; +return tok::H_BIF_BOOTIMAGE; YY_BREAK case 139: YY_RULE_SETUP #line 199 "../s/cmdoptions.l" -return tok::H_BIF_ENCR; +return tok::H_BIF_BL; YY_BREAK case 140: YY_RULE_SETUP #line 200 "../s/cmdoptions.l" -return tok::H_BIF_PID; +return tok::H_BIF_ENCR; YY_BREAK case 141: YY_RULE_SETUP #line 201 "../s/cmdoptions.l" -return tok::H_BIF_AUTH; +return tok::H_BIF_PID; YY_BREAK case 142: YY_RULE_SETUP #line 202 "../s/cmdoptions.l" -return tok::H_BIF_CHKSM; +return tok::H_BIF_AUTH; YY_BREAK case 143: YY_RULE_SETUP #line 203 "../s/cmdoptions.l" -return tok::H_BIF_POWNER; +return tok::H_BIF_CHKSM; YY_BREAK case 144: YY_RULE_SETUP @@ -2153,190 +2159,195 @@ case 145: YY_RULE_SETUP #line 205 "../s/cmdoptions.l" -return tok::H_BIF_PRESIGN; +return tok::H_BIF_POWNER; YY_BREAK case 146: YY_RULE_SETUP #line 206 "../s/cmdoptions.l" -return tok::H_BIF_UDF; +return tok::H_BIF_PRESIGN; YY_BREAK case 147: YY_RULE_SETUP #line 207 "../s/cmdoptions.l" -return tok::H_BIF_XIP; +return tok::H_BIF_UDF; YY_BREAK case 148: YY_RULE_SETUP #line 208 "../s/cmdoptions.l" -return tok::H_BIF_ALIGN; +return tok::H_BIF_XIP; YY_BREAK case 149: YY_RULE_SETUP #line 209 "../s/cmdoptions.l" -return tok::H_BIF_OFFSET; +return tok::H_BIF_ALIGN; YY_BREAK case 150: YY_RULE_SETUP #line 210 "../s/cmdoptions.l" -return tok::H_BIF_RES; +return tok::H_BIF_OFFSET; YY_BREAK case 151: YY_RULE_SETUP #line 211 "../s/cmdoptions.l" -return tok::H_BIF_LOAD; +return tok::H_BIF_RES; YY_BREAK case 152: YY_RULE_SETUP #line 212 "../s/cmdoptions.l" -return tok::H_BIF_STARTUP; +return tok::H_BIF_LOAD; YY_BREAK case 153: YY_RULE_SETUP #line 213 "../s/cmdoptions.l" -return tok::H_BIF_KEYSRCENCR; +return tok::H_BIF_STARTUP; YY_BREAK case 154: YY_RULE_SETUP #line 214 "../s/cmdoptions.l" -return tok::H_BIF_FSBLCFG; +return tok::H_BIF_KEYSRCENCR; YY_BREAK case 155: YY_RULE_SETUP #line 215 "../s/cmdoptions.l" -return tok::H_BIF_BOOTDEV; +return tok::H_BIF_FSBLCFG; YY_BREAK case 156: YY_RULE_SETUP #line 216 "../s/cmdoptions.l" -return tok::H_BIF_DESTCPU; +return tok::H_BIF_BOOTDEV; YY_BREAK case 157: YY_RULE_SETUP #line 217 "../s/cmdoptions.l" -return tok::H_BIF_DESTDEV; +return tok::H_BIF_DESTCPU; YY_BREAK case 158: YY_RULE_SETUP #line 218 "../s/cmdoptions.l" -return tok::H_BIF_EL; +return tok::H_BIF_DESTDEV; YY_BREAK case 159: YY_RULE_SETUP #line 219 "../s/cmdoptions.l" -return tok::H_BIF_TZ; +return tok::H_BIF_EL; YY_BREAK case 160: YY_RULE_SETUP #line 220 "../s/cmdoptions.l" -return tok::H_BIF_AUTHPARAM; +return tok::H_BIF_TZ; YY_BREAK case 161: YY_RULE_SETUP #line 221 "../s/cmdoptions.l" -return tok::H_BIF_BHKEY; +return tok::H_BIF_AUTHPARAM; YY_BREAK case 162: YY_RULE_SETUP #line 222 "../s/cmdoptions.l" -return tok::H_BIF_PFW; +return tok::H_BIF_BHKEY; YY_BREAK case 163: YY_RULE_SETUP #line 223 "../s/cmdoptions.l" -return tok::H_BIF_BLOCKS; +return tok::H_BIF_PFW; YY_BREAK case 164: YY_RULE_SETUP #line 224 "../s/cmdoptions.l" -return tok::H_BIF_BHIV; +return tok::H_BIF_BLOCKS; YY_BREAK case 165: YY_RULE_SETUP #line 225 "../s/cmdoptions.l" -return tok::H_BIF_METAL; +return tok::H_BIF_BHIV; YY_BREAK case 166: YY_RULE_SETUP #line 226 "../s/cmdoptions.l" -return tok::H_BIF_ELYHNDOFF; +return tok::H_BIF_METAL; YY_BREAK case 167: YY_RULE_SETUP #line 227 "../s/cmdoptions.l" -return tok::H_BIF_HIVEC; +return tok::H_BIF_ELYHNDOFF; YY_BREAK case 168: YY_RULE_SETUP #line 228 "../s/cmdoptions.l" -return tok::H_BIF_BHSIGN; +return tok::H_BIF_HIVEC; YY_BREAK case 169: YY_RULE_SETUP #line 229 "../s/cmdoptions.l" -return tok::H_SPLIT; +return tok::H_BIF_BHSIGN; YY_BREAK case 170: YY_RULE_SETUP #line 230 "../s/cmdoptions.l" -return tok::H_BIF_BOOTVEC; +return tok::H_SPLIT; YY_BREAK case 171: YY_RULE_SETUP #line 231 "../s/cmdoptions.l" -return tok::H_BIF_PUFDATA; +return tok::H_BIF_BOOTVEC; YY_BREAK case 172: YY_RULE_SETUP #line 232 "../s/cmdoptions.l" -return tok::H_DPACM_ENABLE; +return tok::H_BIF_PUFDATA; YY_BREAK case 173: YY_RULE_SETUP #line 233 "../s/cmdoptions.l" -return tok::H_BIF_USERKEYS; +return tok::H_DPACM_ENABLE; YY_BREAK case 174: YY_RULE_SETUP -#line 237 "../s/cmdoptions.l" -yylval->cstring=strdup(yytext); return tok::HEXSTRING; +#line 234 "../s/cmdoptions.l" +return tok::H_BIF_USERKEYS; YY_BREAK case 175: YY_RULE_SETUP #line 238 "../s/cmdoptions.l" -yylval->cstring=strdup(yytext); return tok::IDENTIFIER; +yylval->cstring=strdup(yytext); return tok::HEXSTRING; YY_BREAK case 176: YY_RULE_SETUP #line 239 "../s/cmdoptions.l" -yylval->cstring=strdup(yytext); return tok::FILENAME; +yylval->cstring=strdup(yytext); return tok::IDENTIFIER; YY_BREAK case 177: YY_RULE_SETUP #line 240 "../s/cmdoptions.l" -yylval->cstring=strdup(yytext+1); yylval->cstring[strlen(yytext)-2]=0; return tok::QFILENAME; +yylval->cstring=strdup(yytext); return tok::FILENAME; YY_BREAK case 178: YY_RULE_SETUP -#line 243 "../s/cmdoptions.l" -yylloc->step (); +#line 241 "../s/cmdoptions.l" +yylval->cstring=strdup(yytext+1); yylval->cstring[strlen(yytext)-2]=0; return tok::QFILENAME; YY_BREAK case 179: -/* rule 179 can match eol */ YY_RULE_SETUP #line 244 "../s/cmdoptions.l" -yylloc->lines (yyleng); yylloc->step (); +yylloc->step (); YY_BREAK case 180: +/* rule 180 can match eol */ YY_RULE_SETUP #line 245 "../s/cmdoptions.l" -LOG_ERROR("Unknown option on command line: %s\n",yytext); +yylloc->lines (yyleng); yylloc->step (); YY_BREAK case 181: YY_RULE_SETUP #line 246 "../s/cmdoptions.l" +LOG_ERROR("Unknown option on command line: %s\n",yytext); + YY_BREAK +case 182: +YY_RULE_SETUP +#line 247 "../s/cmdoptions.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 2340 "../bisonflex/cmdoptions.yy.cpp" +#line 2351 "../bisonflex/cmdoptions.yy.cpp" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2738,7 +2749,7 @@ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1010 ) + if ( yy_current_state >= 1020 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2771,11 +2782,11 @@ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1010 ) + if ( yy_current_state >= 1020 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 1009); + yy_is_jam = (yy_current_state == 1019); return yy_is_jam ? 0 : yy_current_state; } @@ -3385,7 +3396,7 @@ /* %ok-for-header */ -#line 246 "../s/cmdoptions.l" +#line 247 "../s/cmdoptions.l" diff -Nru xilinx-bootgen-2021.2/debian/changelog xilinx-bootgen-2022.1/debian/changelog --- xilinx-bootgen-2021.2/debian/changelog 2021-11-24 11:26:47.000000000 +0000 +++ xilinx-bootgen-2022.1/debian/changelog 2022-12-01 05:36:24.000000000 +0000 @@ -1,8 +1,20 @@ -xilinx-bootgen (2021.2-1build1) jammy; urgency=medium +xilinx-bootgen (2022.1-1~20.04.1) jammy; urgency=medium - * No-change rebuild against openssl3 + * Backport to jammy - -- Simon Chopin Wed, 24 Nov 2021 12:26:47 +0100 + -- Ethan Hsieh Thu, 01 Dec 2022 13:36:24 +0800 + +xilinx-bootgen (2022.1-1) unstable; urgency=medium + + * New upstream release. + * Update d/control. + - Bump Standards-Version to 4.6.0.1. + * Update d/copyright. + - Update copyright year. + * Update d/watch. + - Update to v4. + + -- Nobuhiro Iwamatsu Wed, 01 Jun 2022 14:12:44 +0900 xilinx-bootgen (2021.2-1) unstable; urgency=medium diff -Nru xilinx-bootgen-2021.2/debian/control xilinx-bootgen-2022.1/debian/control --- xilinx-bootgen-2021.2/debian/control 2021-11-09 04:18:46.000000000 +0000 +++ xilinx-bootgen-2022.1/debian/control 2022-12-01 05:36:24.000000000 +0000 @@ -5,7 +5,7 @@ Priority: optional Section: devel Build-Depends: debhelper-compat (= 13), libssl-dev -Standards-Version: 4.5.1 +Standards-Version: 4.6.0.1 Rules-Requires-Root: no Homepage: https://github.com/Xilinx/bootgen Vcs-Browser: https://salsa.debian.org/xilinx-packages-team/xilinx-bootgen diff -Nru xilinx-bootgen-2021.2/debian/copyright xilinx-bootgen-2022.1/debian/copyright --- xilinx-bootgen-2021.2/debian/copyright 2021-11-09 04:18:46.000000000 +0000 +++ xilinx-bootgen-2022.1/debian/copyright 2022-12-01 05:36:24.000000000 +0000 @@ -47,7 +47,7 @@ License: OpenSSL Files: debian/* -Copyright: 2021, Nobuhiro Iwamatsu +Copyright: 2021-2022, Nobuhiro Iwamatsu License: Apache-2.0 License: Apache-2.0 diff -Nru xilinx-bootgen-2021.2/debian/rules xilinx-bootgen-2022.1/debian/rules --- xilinx-bootgen-2021.2/debian/rules 2021-11-09 04:18:46.000000000 +0000 +++ xilinx-bootgen-2022.1/debian/rules 2022-12-01 05:36:24.000000000 +0000 @@ -7,11 +7,3 @@ override_dh_auto_configure: dh_auto_configure -- --enable-static - -override_dh_auto_test: - # Note: Currently, following tests fail on Debian. This is an - # environmental problem to test. The debian/rules ignores - # the test error by dh_auto_test to ignore these. - # FAIL: unit/test-dbus-message-fds - # FAIL: unit/test-dbus-properties - -dh_auto_test diff -Nru xilinx-bootgen-2021.2/debian/watch xilinx-bootgen-2022.1/debian/watch --- xilinx-bootgen-2021.2/debian/watch 2021-11-09 04:18:46.000000000 +0000 +++ xilinx-bootgen-2022.1/debian/watch 2022-12-01 05:36:24.000000000 +0000 @@ -1,3 +1,3 @@ -version=3 -opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/bar-$1.tar.gz/,dversionmangle=s/\+dfsg// \ - https://github.com/Xilinx/bootgen/tags .*/v?(\d\S*)\.tar\.gz +version=4 +opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/bootgen-$1.tar.gz/,dversionmangle=s/\+dfsg// \ + https://github.com/Xilinx/bootgen/tags .*/xilinx_v?(\d\S*)\.tar\.gz diff -Nru xilinx-bootgen-2021.2/dyn_link.h xilinx-bootgen-2022.1/dyn_link.h --- xilinx-bootgen-2021.2/dyn_link.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/dyn_link.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -// 67d7842dbbe25473c3c32b93c0da8047785f30d78e8a024de1b57352245f9689 -/****************************************************************************** -* Copyright 2019-2020 Xilinx, Inc. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -******************************************************************************/ - -#ifndef D_cdo_dyn_link -#define D_cdo_dyn_link - -#ifdef _MSC_VER -# define CDOUTIL_EXPORT __declspec(dllexport) -#endif -#ifdef __GNUC__ -# define CDOUTIL_EXPORT __attribute__ ((visibility("default"))) -#endif - -#ifndef CDOUTIL_EXPORT -# define CDOUTIL_EXPORT -#endif - -#endif /* D_cdo_dyn_link */ diff -Nru xilinx-bootgen-2021.2/elftools.cpp xilinx-bootgen-2022.1/elftools.cpp --- xilinx-bootgen-2021.2/elftools.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/elftools.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -502,6 +502,41 @@ stringTableSectionSize = sectionHdrTbl[header.e_shstrndx].sh_size; } + + uint64_t dataSecAddr = 0; + uint64_t dataSecOff = 0; + + for(unsigned int index = 0; index < sectionHdrEntryCount; index++) + { + stringTableSection = (StringTableSectionTbl *)(start + sectionHdrTbl[header.e_shstrndx].sh_offset); + char* name = (char*) stringTableSection; + std::string sectn = name + sectionHdrTbl[index].sh_name; + + if(sectn == ".data") + { + dataSecAddr = sectionHdrTbl[index].sh_addr; + dataSecOff = sectionHdrTbl[index].sh_offset; + } + if(sectionHdrTbl[index].sh_type == SHT_SYMTAB) + { + symbolTableSection = (Elf64Symbol_t *)((char *)start + sectionHdrTbl[index].sh_offset); + int count = sectionHdrTbl[index].sh_size / sectionHdrTbl[index].sh_entsize; + char *symbol_names = (char *)(start + sectionHdrTbl[sectionHdrTbl[index].sh_link].sh_offset); + + for (int symb = 0; symb < count; symb++) + { + std::string name = symbol_names + symbolTableSection[symb].st_name; + + if(name == "bif_atf_handoff_params") + { + atf_handoff_params_found = true; + uint64_t symbValue = symbolTableSection[symb].st_value; + uint64_t offset = symbValue - dataSecAddr; + atf_handoff_params_offset = dataSecOff + offset; + } + } + } + } } /* If a Program header is defined, get its pointer and its record size @@ -535,6 +570,11 @@ prgHdr.data = new uint8_t[prgHdr.p_filesz]; memcpy( prgHdr.data,( start + prgHdr.p_offset ),prgHdr.p_filesz); + if((atf_handoff_params_offset >= prgHdr.p_offset) && (atf_handoff_params_offset <= (prgHdr.p_offset + prgHdr.p_filesz))) + { + atf_handoff_params_offset -= prgHdr.p_offset; + atf_handoff_params_prg_hdr_count = index; + } if( index == 0 ) { diff -Nru xilinx-bootgen-2021.2/elftools.h xilinx-bootgen-2022.1/elftools.h --- xilinx-bootgen-2021.2/elftools.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/elftools.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2020 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,6 +38,7 @@ /* Forward Class Declarations */ class Elf32SectionHdr_t; class Elf64SectionHdr_t; +class Elf64Symbol_t; /* ------------------------------------------------------------------------------- @@ -231,6 +232,9 @@ , lowestProgramAddress(0xFFFFFFFF) , highestProgramAddress(0) , endian(Endianness::NotEndian) + , atf_handoff_params_offset(0) + , atf_handoff_params_prg_hdr_count(0) + , atf_handoff_params_found(false) { }; ~ElfFormat() {}; @@ -255,6 +259,10 @@ uint64_t stringTableSectionSize; uint64_t lowestProgramAddress; uint64_t highestProgramAddress; + + uint64_t atf_handoff_params_offset; + uint64_t atf_handoff_params_prg_hdr_count; + bool atf_handoff_params_found; }; /******************************************************************************/ @@ -298,6 +306,7 @@ Elf64_Ehdr header; std::vector programHeaders; Elf64SectionHdr_t* sectionHdrTbl; + Elf64Symbol_t* symbolTableSection; private: void TrimUnwantedELFHeaders( Elf64ProgramHeader& prgHeader, uint8_t* elfStart ); void DeendianELFHdr(uint8_t*); @@ -400,4 +409,26 @@ sh_entsize= DeendianUInt64(endian, sh_entsize); } }; + +/*************************************************************************************/ +class Elf64Symbol_t +{ + public: + Elf64Symbol_t() {} + Elf64Symbol_t(Elf64Symbol_t* sym_t) + { + st_name = sym_t->st_name; + st_info = sym_t->st_info; + st_other = sym_t->st_other; + st_shndx = sym_t->st_shndx; + st_value = sym_t->st_value; + st_size = sym_t->st_size; + } + Elf64_Word st_name; + unsigned char st_info; + unsigned char st_other; + Elf64_Half st_shndx; + Elf64_Addr st_value; + Elf64_Xword st_size; +}; #endif diff -Nru xilinx-bootgen-2021.2/encryption-zynq.cpp xilinx-bootgen-2022.1/encryption-zynq.cpp --- xilinx-bootgen-2021.2/encryption-zynq.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/encryption-zynq.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2019 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -897,7 +897,7 @@ break; } - char c; + char c = ' '; if (word == "Key") { // First Word is "Key" diff -Nru xilinx-bootgen-2021.2/encryption.cpp xilinx-bootgen-2022.1/encryption.cpp --- xilinx-bootgen-2021.2/encryption.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/encryption.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,6 +36,12 @@ /******************************************************************************/ void EncryptionContext::GenerateEncryptionKeyFile(const std::string & baseFileName, Options & options) { + static bool kdfVersion = false; + if (!kdfVersion) + { + LOG_TRACE("KDF Version : 0x%X", kdf->GetVersion()); + kdfVersion = true; + } LOG_TRACE("Generating the AES key file"); std::string devicePartName = options.GetDevicePartName(); if (devicePartName != "") @@ -292,13 +298,26 @@ } /******************************************************************************/ +static int myrand(void) +{ + static unsigned long next; + static int firsttime = 1; + if (firsttime) { + firsttime = 0; + next = time(NULL); + } + next = next * 1103515245 + 12345; + return((unsigned)(next / 65536) % 32768); +} + +/******************************************************************************/ static uint32_t GetRandomValue(uint32_t maxValue) { uint32_t returnValue; do { - returnValue = (rand() / (int)(((unsigned)RAND_MAX + 1) / maxValue)); + returnValue = (myrand() / (int)(((unsigned)RAND_MAX + 1) / maxValue)); } while (returnValue > maxValue); return returnValue; diff -Nru xilinx-bootgen-2021.2/encryption.h xilinx-bootgen-2022.1/encryption.h --- xilinx-bootgen-2021.2/encryption.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/encryption.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2020 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -97,7 +97,6 @@ , fixedInputDataExits(false) { kdf = new Kdf(); - LOG_TRACE("KDF Version : 0x%X", kdf->GetVersion()); }; virtual ~EncryptionContext() @@ -113,7 +112,6 @@ return Encryption::None; } virtual void Process(BootImage& bi, PartitionHeader* partition) {}; - virtual void Process(BootImage & bi, PartitionHeader * partHdr, bool chunkbootloader) {}; virtual void Process(BootImage& bi) {}; virtual void WriteEncryptionKeyFile(const std::string& baseFileName, bool useOptionalKey, uint32_t blocks) {}; virtual void ReadEncryptionKeyFile(const std::string& keyFileName) {}; diff -Nru xilinx-bootgen-2021.2/help.h xilinx-bootgen-2022.1/help.h --- xilinx-bootgen-2021.2/help.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/help.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -506,6 +506,30 @@ -------------+----------------------------------------------------------------+\n" /****************************************************************************** + overlay_cdo +******************************************************************************/ +#define OVERLAYCDO "\ +-------------+----------------------------------------------------------------+\n\ + OPTION | overlay_cdo |\n\ +-------------+----------------------------------------------------------------+\n\ + SUPPORTED | versal |\n\ +-------------+----------------------------------------------------------------+\n\ + DESCRIPTION | CDO overlay option provides a way to modify CDO files |\n\ + | after they are generated. |\n\ +-------------+----------------------------------------------------------------+\n\ + SYNOPSIS | -overlay_cdo |\n\ +-------------+----------------------------------------------------------------+\n\ + USAGE | bootgen -arch versal -image test.bif |\n\ + | -o test.bin -overlay_cdo ovl.cdo |\n\ +-------------+----------------------------------------------------------------+\n\ + EXPLANATION | The input file used with overlay_cdo command would have markers|\n\ + | and content which needs to be overlayed. |\n\ + | Bootgen searches for similar markers in all the cdo files |\n\ + | present inside BIF, when found the content in that cdo will be |\n\ + | replaced with the content from overlay cdo. |\n\ +-------------+----------------------------------------------------------------+\n" + +/****************************************************************************** p ******************************************************************************/ #define PHELP "\ diff -Nru xilinx-bootgen-2021.2/imageheadertable-versal.cpp xilinx-bootgen-2022.1/imageheadertable-versal.cpp --- xilinx-bootgen-2021.2/imageheadertable-versal.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/imageheadertable-versal.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,6 +36,7 @@ extern "C" { #include "cdo-npi.h" #include "cdo-source.h" +#include "cdo-command.h" #include "cdo-binary.h" #include "cdo-load.h" #include "cdo-overlay.h" @@ -57,6 +58,18 @@ */ /******************************************************************************/ +CdoSsitSyncMaster* CdoCmdWriteSsitSyncMaster() +{ + CdoSsitSyncMaster* cdoCmd = new CdoSsitSyncMaster; + cdoCmd->header.reserved = 0x00; + cdoCmd->header.length = 0x0; + cdoCmd->header.handler_id = 1; + cdoCmd->header.cmd_id = CdoCmds::SSIT_SYNC_MASTER; + LOG_TRACE("CDO_CMD_SSIT_SYNC_MASTER"); + return cdoCmd; +} + +/******************************************************************************/ VersalImageHeaderTable::VersalImageHeaderTable() : kekIvMust(false) , bootDevice(0) @@ -124,7 +137,7 @@ SetHeaderTablesSize(); SetTotalMetaHdrLength(0); SetIdentificationString(bi.IsBootloaderFound()); - SetIds(); + SetIds(bi.imageList.size() != 0); metaHdrKeySrc = bi.options.bifOptions->metaHdrAttributes.encrKeySource; SetMetaHdrSecureHdrIv(metaHdrSecHdrIv); dpacm = bi.bifOptions->metaHdrAttributes.dpaCM; @@ -160,7 +173,7 @@ } SetIdentificationString(bi.IsBootloaderFound()); - SetIds(); + SetIds(bi.imageList.size() != 0); if (bi.bifOptions->metaHdrAttributes.encrKeySource != KeySource::None) { @@ -384,9 +397,9 @@ } /******************************************************************************/ -void VersalImageHeaderTable::SetIds() +void VersalImageHeaderTable::SetIds(bool warnIdCode) { - if (idCode == 0) + if (idCode == 0 && warnIdCode) { LOG_WARNING("id_code is not specified in BIF, default id code is 0x04ca8093 (s80 device)"); idCode = DEFAULT_ID_CODE_S80; @@ -1398,7 +1411,7 @@ if (filelist.size() > 0) { - ParseCdos(bi, filelist, &buffer, &size); + ParseCdos(bi, filelist, &buffer, &size, false); } SetPartitionType(PartitionType::CONFIG_DATA_OBJ); PartitionHeader* hdr = new VersalPartitionHeader(this, 0); @@ -1700,7 +1713,8 @@ LOG_INFO("File for merging - %s ", bi.bifOptions->GetPmcCdoFileList().at(0).c_str()); } - ParseCdos(bi, bi.bifOptions->GetPmcCdoFileList(), &cdo_partition, &cdo_length); + bool add_ssit_sync_master_cmd = (bi.bifOptions->pdiType == PartitionType::SLR_SLAVE_BOOT); + ParseCdos(bi, bi.bifOptions->GetPmcCdoFileList(), &cdo_partition, &cdo_length, add_ssit_sync_master_cmd); /* Calculate pad bytes for aligning PMC CDO for 16 byte-alignment */ uint32_t total_cdo_pad_bytes = 0; if (cdo_length % 16 != 0) @@ -1772,6 +1786,11 @@ partHdr->execAddress = exec_addr; partHdr->loadAddress = load_addr; partHdr->execState = proc_state; + if (elf->atf_handoff_params_prg_hdr_count == iprog && elf->atf_handoff_params_found) + { + partHdr->atf_handoff_params_offset = elf->atf_handoff_params_offset; + partHdr->update_atf_handoff_params = true; + } partHdr->partition = new VersalPartition(partHdr, partition_data, total_size); @@ -1787,7 +1806,7 @@ } /******************************************************************************/ -void VersalImageHeader::ParseCdos(BootImage& bi, std::vector filelist, uint8_t** cdo_data, size_t* cdo_size) +void VersalImageHeader::ParseCdos(BootImage& bi, std::vector filelist, uint8_t** cdo_data, size_t* cdo_size, bool add_ssit_sync_master) { uint8_t* total_cdo_data = NULL; uint64_t total_cdo_length = 0; @@ -1807,10 +1826,28 @@ uint64_t actual_cdo_size = 0; const char* cdo_filename = filelist.at(idx).c_str(); CdoSequence * cdo_seq; - cdo_seq = cdoseq_load_cdo(cdo_filename); - if (cdo_seq == NULL) + CdoSequence * cdo_seq1; + + if (add_ssit_sync_master) { - LOG_ERROR("Error parsing CDO file"); + /* Add SSIT Sync Master command */ + cdo_seq1 = cdoseq_load_cdo(cdo_filename); + if (cdo_seq1 == NULL) + { + LOG_ERROR("Error parsing CDO file"); + } + cdo_seq = cdocmd_create_sequence(); + cdocmd_add_ssit_sync_master(cdo_seq); + cdocmd_concat_seq(cdo_seq, cdo_seq1); + add_ssit_sync_master = false; + } + else + { + cdo_seq = cdoseq_load_cdo(cdo_filename); + if (cdo_seq == NULL) + { + LOG_ERROR("Error parsing CDO file"); + } } if (bi.overlayCDO && cdooverlay_apply(cdo_seq, (CdoOverlayInfo *)(bi.overlayCDO))) { @@ -2470,14 +2507,14 @@ } /******************************************************************************/ -CdoSsitSlaves* CdoCmdWriteSsitSyncSlaves(uint8_t num_slrs) +CdoSsitSlaves* CdoCmdWriteSsitSyncSlaves(uint8_t mask) { CdoSsitSlaves* cdoCmd = new CdoSsitSlaves; cdoCmd->header.reserved = 0x00; cdoCmd->header.length = 0x2; cdoCmd->header.handler_id = 1; cdoCmd->header.cmd_id = CdoCmds::SSIT_SYNC_SLAVES; - cdoCmd->mask = 0x7 >> (MAX_SLAVE_SLRS - num_slrs); + cdoCmd->mask = mask; cdoCmd->timeout_ms = 0xFFFF; LOG_TRACE("CDO_CMD_SSIT_SYNC_SLAVES - %d, %x", cdoCmd->mask, cdoCmd->timeout_ms); return cdoCmd; @@ -2738,6 +2775,10 @@ { LOG_ERROR("Error parsing CDO file"); } + if (bi.overlayCDO && cdooverlay_apply(cdo_seq, (CdoOverlayInfo *)(bi.overlayCDO))) + { + LOG_ERROR("Error applying overlay CDO file : %s", cdo_filename); + } cdo_buffer = (uint8_t*)cdoseq_to_binary(cdo_seq, &size, 0); partHdr->partitionSize = size; partHdr->partition = new VersalPartition(partHdr, cdo_buffer, size); @@ -2768,18 +2809,22 @@ slrBootPdiInfo.sort(SortByIndex); num_of_slrs = GetTotalSlrCount(slrBootPdiInfo); + char * do_ssit_check = getenv("BOOTGEN_DO_SSIT_NOC_CHECK"); + bool master_cdo_verified = 0; std::string device_name = ""; - switch (bi.bifOptions->idCode) { - case 0x04d14093: /* h50 */ - device_name = "xcvp1802"; - break; - default: - LOG_WARNING("Unknown SSIT device IDCODE 0x%08x, skipping verification of NoC configuration", bi.bifOptions->idCode); + + if (do_ssit_check != NULL) + { + switch (bi.bifOptions->idCode) { + case 0x04d14093: /* h50 */ + device_name = "xcvp1802"; + break; + default: + LOG_WARNING("Skipping NoC configuration verification for the SSIT device. Device IDCODE 0x%08x, ", bi.bifOptions->idCode); + } } /* Add CDO Write Keyhole commands */ - char * do_ssit_check = getenv("BOOTGEN_DO_SSIT_NOC_CHECK"); - bool master_cdo_verified = 0; for (std::list::iterator slr_id = slrBootPdiInfo.begin(); slr_id != slrBootPdiInfo.end(); slr_id++) { uint32_t file_size; @@ -2797,6 +2842,7 @@ file_size = slr_boot_data.len; pad_size = file_size + ((4 - (file_size & 3)) & 3); uint32_t bh_offset = 0; + uint32_t ih_offset = *((uint32_t *)(slr_boot_data.bytes + bh_offset + 0xc4)); /* Remove the 16-bytes of SMAP bus width from start of PDI */ uint32_t smap_data = (slr_boot_data.bytes[0]) + (slr_boot_data.bytes[1] << 8) + (slr_boot_data.bytes[2] << 16) + (slr_boot_data.bytes[3] << 24); if ((smap_data == 0xDD000000) || (smap_data == 0x00DD0000) || (smap_data == 0x000000DD)) @@ -2804,6 +2850,13 @@ bh_offset = (SMAP_BUS_WIDTH * 4); file_size -= (SMAP_BUS_WIDTH * 4); pad_size -= (SMAP_BUS_WIDTH * 4); + ih_offset -= (SMAP_BUS_WIDTH * 4); + } + + uint32_t p1_size = ih_offset, p2_size = file_size - p1_size; + //if (getenv("BOOTGEN_SPLIT_SSIT_SLAVE_BOOT_PDI") != NULL) + { + pad_size = p1_size + ((4 - (p1_size & 3)) & 3); } if ((device_name != "") && (do_ssit_check != NULL)) @@ -2870,14 +2923,53 @@ CdoCommandWriteKeyhole* cdoCmd = CdoCmdWriteKeyHole(pad_size, (*slr_id)->index); memcpy(p_buffer + p_offset, cdoCmd, CDO_CMD_WRITE_KEYHOLE_SIZE); p_offset += CDO_CMD_WRITE_KEYHOLE_SIZE; - delete cdoCmd; - memcpy(p_buffer + p_offset, slr_boot_data.bytes + bh_offset, file_size); - p_offset += file_size; - if ((pad_size - file_size) != 0) + { - memset(p_buffer + p_offset, 0, pad_size - file_size); - p_offset += pad_size; + memcpy(p_buffer + p_offset, slr_boot_data.bytes + bh_offset, p1_size); + p_offset += p1_size; + if ((pad_size - p1_size) != 0) + { + memset(p_buffer + p_offset, 0, pad_size - p1_size); + p_offset += pad_size - p1_size; + } + + /* Add SSIT Sync Slave command */ + size += sizeof(CdoSsitSlaves); + p_buffer = (uint8_t*)realloc(p_buffer, size); + CdoSsitSlaves *ssit_sync_slaves_cmd = CdoCmdWriteSsitSyncSlaves(1 << ((*slr_id)->index - 1) & 0xFF); + memcpy(p_buffer + p_offset, ssit_sync_slaves_cmd, sizeof(CdoSsitSlaves)); + p_offset += sizeof(CdoSsitSlaves); + delete ssit_sync_slaves_cmd; + /* Add part 2 write keyhole*/ + pad_size = p2_size + ((4 - (p2_size & 3)) & 3); + pad_bytes = ((16 - ((p_offset + CDO_CMD_WRITE_KEYHOLE_SIZE) & 15)) & 15); + size += (CDO_CMD_WRITE_KEYHOLE_SIZE + pad_size + pad_bytes); + p_buffer = (uint8_t*)realloc(p_buffer, size); + if (pad_bytes != 0) + { + CdoCommandNop* cdoCmd = CdoCmdNoOperation(pad_bytes); + LOG_TRACE("NOP - 0x%x", p_offset); + memcpy(p_buffer + p_offset, cdoCmd, CDO_CMD_NOP_SIZE); + p_offset += CDO_CMD_NOP_SIZE; + if (cdoCmd->header.length > 0) + { + memset(p_buffer + p_offset, 0, cdoCmd->header.length * sizeof(uint32_t)); + p_offset += (cdoCmd->header.length * sizeof(uint32_t)); + } + } + CdoCommandWriteKeyhole* cdoCmd2 = CdoCmdWriteKeyHole(pad_size, (*slr_id)->index); + memcpy(p_buffer + p_offset, cdoCmd2, CDO_CMD_WRITE_KEYHOLE_SIZE); + p_offset += CDO_CMD_WRITE_KEYHOLE_SIZE; + memcpy(p_buffer + p_offset, slr_boot_data.bytes + ih_offset + (SMAP_BUS_WIDTH * 4), p2_size); + p_offset += p2_size; + if ((pad_size - p2_size) != 0) + { + memset(p_buffer + p_offset, 0, pad_size - p2_size); + p_offset += pad_size - p2_size; + } + delete cdoCmd2; } + delete cdoCmd; /* Add SSIT Wait Slave command */ size += sizeof(CdoSsitSlaves); @@ -2893,7 +2985,7 @@ /* Add SSIT Sync Slave command */ size += sizeof(CdoSsitSlaves); p_buffer = (uint8_t*)realloc(p_buffer, size); - CdoSsitSlaves *ssit_sync_slaves_cmd = CdoCmdWriteSsitSyncSlaves(num_of_slrs); + CdoSsitSlaves *ssit_sync_slaves_cmd = CdoCmdWriteSsitSyncSlaves(((1 << num_of_slrs) - 1) & 0xFF); memcpy(p_buffer + p_offset, ssit_sync_slaves_cmd, sizeof(CdoSsitSlaves)); p_offset += sizeof(CdoSsitSlaves); delete ssit_sync_slaves_cmd; @@ -2913,6 +3005,10 @@ LOG_ERROR("Error parsing CDO file : %s", cdo_filename); } + if (bi.overlayCDO && cdooverlay_apply(cdo_seq, (CdoOverlayInfo *)(bi.overlayCDO))) + { + LOG_ERROR("Error applying overlay CDO file : %s", cdo_filename); + } if ((master_cdo_verified == 0) && (device_name != "") && (do_ssit_check != NULL)) { std::string golden_cdo_filename = device_name + "_boot_0.rnpi"; @@ -2958,7 +3054,7 @@ p_buffer = (uint8_t*)realloc(p_buffer, size); /* Add SSIT Sync Slave command */ - CdoSsitSlaves *ssit_sync_slaves_cmd = CdoCmdWriteSsitSyncSlaves(num_of_slrs); + CdoSsitSlaves *ssit_sync_slaves_cmd = CdoCmdWriteSsitSyncSlaves(((1 << num_of_slrs) - 1) & 0xFF); memcpy(p_buffer + p_offset, ssit_sync_slaves_cmd, sizeof(CdoSsitSlaves)); p_offset += sizeof(CdoSsitSlaves); delete ssit_sync_slaves_cmd; @@ -3222,10 +3318,15 @@ const char* cdo_filename = (*slr_info)->file.c_str(); CdoSequence * master_cdo_seq; master_cdo_seq = cdoseq_load_cdo(cdo_filename); + CheckIdsInCdo(master_cdo_seq); if (master_cdo_seq == NULL) { LOG_ERROR("Error parsing CDO file"); } + if (bi.overlayCDO && cdooverlay_apply(master_cdo_seq, (CdoOverlayInfo *)(bi.overlayCDO))) + { + LOG_ERROR("Error applying overlay CDO file : %s", cdo_filename); + } size_t part_size = 0; /* Pass the complete CDO sequence and SYNC point index */ @@ -3506,7 +3607,7 @@ */ for (uint32_t ix = 0; ix < slr_info->sync_addresses.size(); ix++) { - if ((slr_info->sync_addresses[ix] > slr_info->offset) && (slr_info->sync_addresses[ix] < (slr_info->offset + size))) + if ((slr_info->sync_addresses[ix] >= slr_info->offset) && (slr_info->sync_addresses[ix] < (slr_info->offset + size))) { slr_info->sync_points++; LOG_TRACE(" sync point - %d",slr_info->sync_points); diff -Nru xilinx-bootgen-2021.2/imageheadertable-versal.h xilinx-bootgen-2022.1/imageheadertable-versal.h --- xilinx-bootgen-2021.2/imageheadertable-versal.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/imageheadertable-versal.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,10 @@ #include "imageheadertable.h" #include "bootheader.h" +extern "C" { #include "cdo-command.h" +} + class ImageBifOptions; class SubSysImageHeader; class BifOptions; @@ -311,7 +314,7 @@ void SetFirstPartitionHeaderOffset(uint32_t offset); void SetPartitionCount(uint32_t count); void SetBootDeviceAddress(uint32_t address); - void SetIds(void); + void SetIds(bool warnIdCode); void SetIdentificationString(bool bootloader); void SetImageHeaderTableAttributes(); void SetTotalMetaHdrLength(uint32_t size); @@ -384,7 +387,7 @@ uint32_t CheckAieEngineDataMemoryBoundary(Binary::Address_t globalAddr, Binary::Length_t pSize); void CreateSlrBootPartition(BootImage& bi); void CreateSlrConfigPartition(BootImage& bi); - void ParseCdos(BootImage& bi, std::vector filelist, uint8_t**, size_t*); + void ParseCdos(BootImage& bi, std::vector filelist, uint8_t**, size_t*, bool); //post-processing bool PostProcessCdo(const uint8_t* cdo_data, Binary::Length_t cdo_size); bool PostProcessCfi(const uint8_t* cdo_data, Binary::Length_t cdo_size); diff -Nru xilinx-bootgen-2021.2/imageheadertable-zynqmp.cpp xilinx-bootgen-2022.1/imageheadertable-zynqmp.cpp --- xilinx-bootgen-2021.2/imageheadertable-zynqmp.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/imageheadertable-zynqmp.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -473,6 +473,31 @@ } } } + + if (Bootloader) + { + /* PMUFW + SPL */ + std::string pmu_fw = bi.bifOptions->GetPmuFwImageFile(); + ByteFile pmu_fw_data(pmu_fw); + Binary::Length_t pmu_size = pmu_fw_data.len; + uint8_t *partition_data = (uint8_t *)malloc(pmu_size); + memcpy(partition_data, pmu_fw_data.bytes, pmu_size); + + uint8_t pmu_padding = (4 - (pmu_size & 3)) & 3; + pmuFwSize = totalPmuFwSize = pmu_size + pmu_padding; + + partition_data = (uint8_t *)realloc(partition_data, pmuFwSize + data.len); + memset(partition_data + pmu_size, 0, pmu_padding); + memcpy(partition_data + pmuFwSize, data.bytes, data.len); + + data.bytes = partition_data; + fsblFwSize = totalFsblFwSize = data.len + ((4 - (data.len & 3)) & 3); + data.len += pmuFwSize; + + if (Load.IsSet()) + hdr->execAddress = Load.Value(); + } + hdr->partition = new Partition(hdr, data.bytes, data.len); hdr->partitionSize = data.len; partitionHeaderList.push_back(hdr); diff -Nru xilinx-bootgen-2021.2/kdf.cpp xilinx-bootgen-2022.1/kdf.cpp --- xilinx-bootgen-2021.2/kdf.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/kdf.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,6 +1,6 @@ // 67d7842dbbe25473c3c32b93c0da8047785f30d78e8a024de1b57352245f9689 /****************************************************************************** -* Copyright 2015-2020 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -704,8 +704,16 @@ if (word == "=") { testFile >> word; - fixed_input_data = new uint8_t[fixed_input_data_byte_length]; - pack_hex(word, fixed_input_data); + if (fixed_input_data_byte_length > 0) + { + fixed_input_data = new uint8_t[fixed_input_data_byte_length]; + pack_hex(word, fixed_input_data); + } + else + { + std::cout << "FixedInputDataByteLen is expected prior to FixedInputData" << std::endl; + exit(KDF_CAVP_KI_LENGTH_IMPROPER); + } } else { diff -Nru xilinx-bootgen-2021.2/kdf.h xilinx-bootgen-2022.1/kdf.h --- xilinx-bootgen-2021.2/kdf.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/kdf.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,6 +1,6 @@ // 67d7842dbbe25473c3c32b93c0da8047785f30d78e8a024de1b57352245f9689 /****************************************************************************** -* Copyright 2015-2020 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,6 +53,7 @@ #define KDF_CAVP_KI_LENGTH_IMPROPER 0x00010003 #define KDF_CAVP_HEXKEY_IMPROPER 0x00010004 #define KDF_CAVP_VERIFY_KO_FAILED 0x00010005 +#define KDF_CAVP_FID_LENGTH_IMPROPER 0x00010006 /********************************************************************************/ class Kdf diff -Nru xilinx-bootgen-2021.2/main.cpp xilinx-bootgen-2022.1/main.cpp --- xilinx-bootgen-2021.2/main.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/main.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2020 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -56,7 +56,7 @@ LOG_MSG("\n"); LOG_MSG("****** %s v%s", PROGRAMNAME, RDI_VERSION); LOG_MSG(" **** Build date : %s-%s", date_stamp, time_stamp); - LOG_MSG(" ** Copyright 1986-%s Xilinx, Inc. All Rights Reserved.\n", year ? year : "2018"); + LOG_MSG(" ** Copyright 1986-%s Xilinx, Inc. All Rights Reserved.\n", year ? year : "2022"); } /******************************************************************************/ diff -Nru xilinx-bootgen-2021.2/options.h xilinx-bootgen-2022.1/options.h --- xilinx-bootgen-2021.2/options.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/options.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -103,7 +103,7 @@ , qspiSize(0) , logLevel(LogLevel::WARNING) , outputFmt(File::Unknown) - , readImageOption(ReadImageOption::ALL) + , readImageOption(ReadImageOption::NONE) , readImageFile("") , verifyImage(false) , bifOptions(NULL) diff -Nru xilinx-bootgen-2021.2/partition.cpp xilinx-bootgen-2022.1/partition.cpp --- xilinx-bootgen-2021.2/partition.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/partition.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,12 +28,6 @@ #include "authentication-zynq.h" #include "authentication-zynqmp.h" -/* TCM address for R5 */ -#define R5_TCM_START_ADDRESS 0x0000 -#define R5_BTCM_START_ADDRESS 0x20000 -#define R5_TCM_BANK_LENGTH 0x10000 -#define PMU_RAM_END_ADDRESS 0xFFDDFFFF - /* ------------------------------------------------------------------------------- ***************************************************** F U N C T I O N S *** @@ -49,7 +43,7 @@ } /******************************************************************************/ -Partition::Partition(PartitionHeader* header0, const uint8_t* data, Binary::Length_t length) +Partition::Partition(PartitionHeader* header0, const uint8_t* data, Binary::Length_t length) : header(header0) { std::string partName = header->imageHeader->GetName() + StringUtils::Format(".%d",header->index); diff -Nru xilinx-bootgen-2021.2/partitionheadertable-versal.cpp xilinx-bootgen-2022.1/partitionheadertable-versal.cpp --- xilinx-bootgen-2021.2/partitionheadertable-versal.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/partitionheadertable-versal.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,29 @@ #include "bootheader-versal.h" #include "authentication-versal.h" +typedef enum +{ + atfHandoffExecStateShift = 0, + atfHandoffEndiannessShift = 1, + atfHandoffTrustzoneShift = 2, + atfHandoffExceptionLevelShift = 3, + atfHandoffDestCpuShift = 5, +} atf_handoff_partition_attributes; + +#define FSBL_MAX_PARTITIONS 6 + +/* Structure corresponding to each partition entry */ +struct atf_handoff_partition { + uint64_t entry_point; + uint64_t flags; +}; + +/* Structure for hand off parameters to ARM Trusted Firmware (ATF) */ +struct atf_handoff_params_struct { + uint8_t magic[4]; + uint32_t num_entries; + struct atf_handoff_partition handoff_partition[FSBL_MAX_PARTITIONS]; +} atf_handoff_params ; /* ------------------------------------------------------------------------------- @@ -376,7 +399,7 @@ break; case KeySource::EfuseUserGryKey1: - pHTable->partitionKeySource = EFUSE_USER_BLK_KEY1; + pHTable->partitionKeySource = EFUSE_USER_GRY_KEY1; kekIvFile = bifOptions->GetEfuseUserKek1IVFile(); if (kekIvFile == "") { @@ -887,6 +910,8 @@ (*partHdr)->Build(bi, cache); } + UpdateAtfHandoffParams(bi); + if (bi.partitionHeaderList.size() > 0) { bi.partitionHeaderTable->firstSection = bi.partitionHeaderList.front()->section; @@ -1167,6 +1192,51 @@ } } +/******************************************************************************/ +void VersalPartitionHeaderTable::UpdateAtfHandoffParams(BootImage & bi) +{ + memset(&atf_handoff_params, 0, sizeof(atf_handoff_params_struct)); + strncpy((char*)atf_handoff_params.magic, "XLNX",4); + atf_handoff_params.num_entries = 0; + + for (std::list::iterator partHdr = bi.partitionHeaderList.begin(); partHdr != bi.partitionHeaderList.end(); partHdr++) + { + DestinationCPU::Type core = (*partHdr)->imageHeader->GetDestCpu(); + ExceptionLevel::Type exceptionLevel = (*partHdr)->imageHeader->GetExceptionLevel(); + TrustZone::Type trustzone = (*partHdr)->imageHeader->GetTrustZone(); + + //if((core = a72 - 0 or a72 - 1) && ((EL = EL2 && trustzone = non - secure) || (EL = EL1 && trustzone = secure) || (EL = EL1 && trustzone = non - secure))) + bool valid_core = ((core == DestinationCPU::A53_0) || (core == DestinationCPU::A53_1)); + bool valid_entry1 = ((exceptionLevel == ExceptionLevel::EL2) && (trustzone == TrustZone::NonSecure)); + bool valid_entry2 = (exceptionLevel == ExceptionLevel::EL1); + + if (valid_core && (valid_entry1 || valid_entry2)) + { + atf_handoff_params.handoff_partition[atf_handoff_params.num_entries].entry_point = (*partHdr)->execAddress; + + uint8_t execState = (*partHdr)->execState; + uint8_t endian = ((*partHdr)->elfEndianess == Endianness::BigEndian) ? 1 : 0; + uint8_t destCpu = (core == DestinationCPU::A53_0) ? 0 : 1; + + atf_handoff_params.handoff_partition[atf_handoff_params.num_entries].flags = (execState << atfHandoffExecStateShift) | + (endian << atfHandoffEndiannessShift) | + (trustzone << atfHandoffTrustzoneShift) | + (exceptionLevel << atfHandoffExceptionLevelShift) | + (destCpu << atfHandoffDestCpuShift); + + atf_handoff_params.num_entries++; + } + } + + for (std::list::iterator partHdr = bi.partitionHeaderList.begin(); partHdr != bi.partitionHeaderList.end(); partHdr++) + { + if ((*partHdr)->update_atf_handoff_params) + { + memcpy((*partHdr)->partition->section->Data + (*partHdr)->atf_handoff_params_offset, &atf_handoff_params, sizeof(atf_handoff_params_struct)); + } + } +} + /******************************************************************************/ void VersalPartitionHeaderTable::Link(BootImage & bi) { diff -Nru xilinx-bootgen-2021.2/partitionheadertable-versal.h xilinx-bootgen-2022.1/partitionheadertable-versal.h --- xilinx-bootgen-2021.2/partitionheadertable-versal.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/partitionheadertable-versal.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -222,6 +222,7 @@ public: void Build(BootImage& bi, Binary& cache); void ConfigureMetaHdrAuthenticationContext(BootImage& bi); + void UpdateAtfHandoffParams(BootImage& bi); void Link(BootImage& bi); Section* firstSection; }; diff -Nru xilinx-bootgen-2021.2/partitionheadertable.cpp xilinx-bootgen-2022.1/partitionheadertable.cpp --- xilinx-bootgen-2021.2/partitionheadertable.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/partitionheadertable.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2020 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -236,6 +236,45 @@ { bi.headerAC->Link(bi, bi.imageHeaderTable->section); } + + std::list::iterator partHdr = bi.partitionHeaderList.begin(); + for (uint32_t currHdr = 0; currHdr < bi.partitionHeaderList.size(); currHdr++, partHdr++) + { + uint8_t currCpu = (*partHdr)->GetDestinationCpu(); + uint64_t currStrtAddr = (*partHdr)->GetLoadAddress(); + uint64_t currEndAddr = currStrtAddr + (*partHdr)->GetPartitionSize(); + bool currCpuR5 = (currCpu == DestinationCPU :: R5_0 || currCpu == DestinationCPU :: R5_1 || currCpu == DestinationCPU :: R5_lockstep); + bool isCurrPartitionOnTcm = false; + + std::list::iterator nextPartHdr = bi.partitionHeaderList.begin(); + std::advance(nextPartHdr, currHdr + 1); + for (uint32_t nxtHdr = currHdr + 1; nxtHdr < bi.partitionHeaderList.size(); nxtHdr++) + { + uint8_t nxtCpu = (*nextPartHdr)->GetDestinationCpu(); + uint64_t nxtStrtAddr = (*nextPartHdr)->GetLoadAddress(); + uint64_t nxtEndAddr = nxtStrtAddr + (*nextPartHdr)->GetPartitionSize(); + bool nxtCpuR5 = (nxtCpu == DestinationCPU :: R5_0 || nxtCpu == DestinationCPU :: R5_1 || nxtCpu == DestinationCPU :: R5_lockstep); + bool isNxtPartitionOnTcm = false; + + if (currCpuR5 != nxtCpuR5) + { + isCurrPartitionOnTcm = IsTcmMemoryRange((currCpu == DestinationCPU :: R5_lockstep) ? true:false, currStrtAddr, currEndAddr); + isNxtPartitionOnTcm = IsTcmMemoryRange((nxtCpu == DestinationCPU :: R5_lockstep) ? true:false, nxtStrtAddr, nxtEndAddr); + if (isCurrPartitionOnTcm || isNxtPartitionOnTcm) + { + std::advance(nextPartHdr, 1); + continue; + } + } + + if ((nxtEndAddr >= currStrtAddr) && (nxtStrtAddr <= currEndAddr)) + { + LOG_WARNING("Partition %s range is overlapped with partition %s memory range", (*partHdr)->partition->section->Name.c_str(), (*nextPartHdr)->partition->section->Name.c_str()); + LOG_TRACE("Current Partition %s Start Address is %X and End Address is %X ,Next Partition %s Start Address is %X and End Address %X",(*partHdr)->partition->section->Name.c_str(), currStrtAddr, currEndAddr, (*nextPartHdr)->partition->section->Name.c_str(),nxtStrtAddr, nxtEndAddr); + } + std::advance(nextPartHdr, 1); + } + } } /******************************************************************************/ @@ -249,12 +288,12 @@ /******************************************************************************/ PartitionHeader::PartitionHeader(ImageHeader* imageheader, int index) - : imageHeader(imageheader) + : imageHeader(imageheader) , index(index) , partition(NULL) , checksumSection(NULL) , headAlignment(0) - , tailAlignment(0) + , tailAlignment(0) , authCertPresent(0) , encryptFlag(0) , checksumType(0) @@ -288,6 +327,8 @@ , firstChunkSize(0) , isPmcdata(false) , partitionType(PartitionType::RESERVED) + , update_atf_handoff_params(false) + , atf_handoff_params_offset(0) { if(imageheader != NULL) { @@ -338,3 +379,20 @@ SetPartitionNumber(partitionNum); SetChecksum(); } + +/****************************************************************************************************************/ +bool PartitionHeaderTable::IsTcmMemoryRange(bool isR5LockStep, uint64_t strtAddr, uint64_t endAddr) +{ + bool tcm_R5 = false; + if (isR5LockStep) + { + tcm_R5 = ((strtAddr > R5_BTCM_START_ADDRESS) && (strtAddr < (R5_TCM_START_ADDRESS + R5_TCM_BANK_LENGTH * 4)) && (endAddr <= (R5_TCM_START_ADDRESS + R5_TCM_BANK_LENGTH * 4))); + } + else + { + bool Tcm = (strtAddr >= R5_TCM_START_ADDRESS) && (strtAddr < (R5_TCM_START_ADDRESS + R5_TCM_BANK_LENGTH)) && (endAddr <= (R5_TCM_START_ADDRESS + R5_TCM_BANK_LENGTH)); + bool Btcm = ((strtAddr > R5_BTCM_START_ADDRESS) && (strtAddr < (R5_BTCM_START_ADDRESS + R5_TCM_BANK_LENGTH)) && (endAddr <= (R5_BTCM_START_ADDRESS + R5_TCM_BANK_LENGTH))); + tcm_R5 = (Tcm || Btcm); + } + return tcm_R5; +} diff -Nru xilinx-bootgen-2021.2/partitionheadertable.h xilinx-bootgen-2022.1/partitionheadertable.h --- xilinx-bootgen-2021.2/partitionheadertable.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/partitionheadertable.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2020 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -166,6 +166,8 @@ uint8_t authBlock; uint64_t firstChunkSize; + uint64_t atf_handoff_params_offset; + bool update_atf_handoff_params; protected: bool slaveBootSplitMode; uint32_t fullBhSize; @@ -186,6 +188,7 @@ virtual void BuildPartitions(BootImage& bi, Binary& cache); virtual void Link(BootImage& bi); virtual void LinkPartitions(BootImage& bi); + bool IsTcmMemoryRange(bool isR5LockStep, uint64_t strtAddr, uint64_t endAddr); Section* firstSection; }; diff -Nru xilinx-bootgen-2021.2/readimage-versal.cpp xilinx-bootgen-2022.1/readimage-versal.cpp --- xilinx-bootgen-2021.2/readimage-versal.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/readimage-versal.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -68,26 +68,117 @@ } } -/******************************************************************************/ -void VersalReadImage::ReadBinaryFile(DumpOption::Type dump, std::string path) +/**********************************************************************************************/ +void VersalReadImage::ReadPartitions() { size_t result; uint64_t offset = 0; - uint32_t index = 0; - bool smap_header_found = false; - dumpType = dump; - dumpPath = path; + uint32_t cnt_index = 0; + FILE *binFile = fopen(binFilename.c_str(), "rb"); - if (StringUtils::GetExtension(binFilename) == ".mcs") + if (!binFile) { - LOG_ERROR("The option '-read' is not supported on mcs format file : %s", binFilename.c_str()); + fclose(binFile); + LOG_ERROR("Cannot read file %s", binFilename.c_str()); } + std::list::iterator pHT = pHTs.begin(); + for (std::list::iterator iH = iHs.begin(); iH != iHs.end(); iH++) + { + uint32_t prev_id = 0xffffffff; + uint32_t section_count = 0; + + for (cnt_index = 0; cnt_index < (*iH)->dataSectionCount; cnt_index++) + { + uint32_t length = (*pHT)->encryptedPartitionLength * 4; + uint8_t* buffer = new uint8_t[length]; + uint32_t id = (*pHT)->puid & 0xFFFF; + offset = (*pHT)->partitionWordOffset * 4; + if (!(fseek(binFile, offset, SEEK_SET))) + { + result = fread(buffer, 1, length, binFile); + if (result != length) + { + LOG_ERROR("Error parsing partitions from PDI file"); + } + if (dumpType == DumpOption::PARTITIONS) + { + if (bH && bH->sourceOffset == offset) + { + length = bH->totalPlmLength; + } + if (prev_id == id) + { + section_count++; + } + DumpPartitions(buffer, length, (*iH)->imageName, id, section_count); + } + else + { + /* Bootloader - compare address offset from BH and PHT */ + if (bH && bH->sourceOffset == offset) + { + length = bH->totalPlmLength; + } + if ((dumpType == DumpOption::PLM) || (dumpType == DumpOption::BOOT_FILES)) + { + DumpPartitions(buffer, length, "plm", id, section_count); + if (dumpType == DumpOption::PLM) + { + delete[] buffer; + fclose(binFile); + return; + } + } + } + /* For extracting PMC DATA, Bootloader - compare address offset from BH and PHT */ + if (bH && bH->sourceOffset == offset) + { + if (bH && bH->totalPmcCdoLength != 0) + { + if ((dumpType == DumpOption::PARTITIONS) || (dumpType == DumpOption::PMC_CDO) || (dumpType == DumpOption::BOOT_FILES)) + { + DumpPartitions(buffer + bH->plmLength, bH->totalPmcCdoLength, "pmc_cdo"); + if ((dumpType == DumpOption::PMC_CDO) || (dumpType == DumpOption::BOOT_FILES)) + { + // if dump boot files, the return from here + delete[] buffer; + fclose(binFile); + return; + } + } + } + if (bH && bH->totalPmcCdoLength == 0 && dumpType == DumpOption::PMC_CDO) + { + LOG_ERROR("PMC_CDO partition is not available in the PDI"); + } + } + } + else + { + LOG_ERROR("Error parsing Partition Headers from bin file"); + } + pHT++; + prev_id = id; + delete[] buffer; + } + } + fclose(binFile); +} + +/******************************************************************************/ +void VersalReadImage::ReadHeaderTableDetails() +{ + size_t result; + uint64_t offset = 0; + uint32_t index = 0; + bool smap_header_found = false; FILE *binFile; binFile = fopen(binFilename.c_str(), "rb"); if (!binFile) { + fclose(binFile); LOG_ERROR("Cannot read file %s", binFilename.c_str()); } @@ -104,7 +195,7 @@ bH = NULL; } - if ((dump == DumpOption::BH) || (dump == DumpOption::BOOT_FILES)) + if ((dumpType == DumpOption::BH) || (dumpType == DumpOption::BOOT_FILES)) { if (bH == NULL) { @@ -159,6 +250,10 @@ { LOG_ERROR("Error parsing Image Header Table from PDI file"); } + if (!((iHT->partitionTotalCount > 0) && (iHT->partitionTotalCount < 0xFF))) + { + LOG_ERROR("Number of partitions read from PDI is more than number of supported partiiton count."); + } } else { @@ -242,96 +337,27 @@ aCs.push_back(aC); } } - else + + fclose(binFile); + return; +} + +/******************************************************************************/ +void VersalReadImage::ReadBinaryFile(DumpOption::Type dump, std::string path) +{ + if (StringUtils::GetExtension(binFilename) == ".mcs") { - fclose(binFile); - return; + LOG_ERROR("The option '-read/-dump' is not supported on mcs format file : %s", binFilename.c_str()); } + dumpType = dump; + dumpPath = path; - uint32_t cnt_index = 0; - std::list::iterator pHT = pHTs.begin(); - for (std::list::iterator iH = iHs.begin(); iH != iHs.end(); iH++) + ReadHeaderTableDetails(); + if (readType != ReadImageOption::NONE) { - uint32_t prev_id = 0xffffffff; - uint32_t section_count = 0; - - for (cnt_index = 0; cnt_index < (*iH)->dataSectionCount; cnt_index++) - { - uint32_t length = (*pHT)->encryptedPartitionLength * 4; - uint8_t* buffer = new uint8_t[length]; - uint32_t id = (*pHT)->puid & 0xFFFF; - offset = (*pHT)->partitionWordOffset * 4; - if (!(fseek(binFile, offset, SEEK_SET))) - { - result = fread(buffer, 1, length, binFile); - if (result != length) - { - LOG_ERROR("Error parsing partitions from PDI file"); - } - if (dump == DumpOption::PARTITIONS) - { - if (bH && bH->sourceOffset == offset) - { - length = bH->totalPlmLength; - } - if (prev_id == id) - { - section_count++; - } - DumpPartitions(buffer, length, (*iH)->imageName, id, section_count); - } - else - { - /* Bootloader - compare address offset from BH and PHT */ - if (bH && bH->sourceOffset == offset) - { - length = bH->totalPlmLength; - } - if ((dump == DumpOption::PLM) || (dump == DumpOption::BOOT_FILES)) - { - DumpPartitions(buffer, length, "plm", id, section_count); - if (dump == DumpOption::PLM) - { - delete[] buffer; - fclose(binFile); - return; - } - } - } - /* For extracting PMC DATA - Bootloader - compare address offset from BH and PHT */ - if (bH && bH->sourceOffset == offset) - { - if (bH && bH->totalPmcCdoLength != 0) - { - if ((dump == DumpOption::PARTITIONS) || (dump == DumpOption::PMC_CDO) || (dump == DumpOption::BOOT_FILES)) - { - DumpPartitions(buffer + bH->plmLength, bH->totalPmcCdoLength, "pmc_cdo"); - if ((dump == DumpOption::PMC_CDO) || (dump == DumpOption::BOOT_FILES)) - { - // if dump boot files, the return from here - delete[] buffer; - fclose(binFile); - return; - } - } - } - if (bH && bH->totalPmcCdoLength == 0 && dump == DumpOption::PMC_CDO) - { - LOG_ERROR("PMC_CDO partition is not available in the PDI"); - } - } - } - else - { - LOG_ERROR("Error parsing Partition Headers from bin file"); - } - pHT++; - prev_id = id; - delete[] buffer; - } + DisplayHeaderTableDetails(readType); } - fclose(binFile); + ReadPartitions(); } /******************************************************************************/ @@ -353,41 +379,8 @@ } /******************************************************************************/ -void VersalReadImage::DisplayImageDetails(ReadImageOption::Type type, DumpOption::Type dump, std::string dump_dir) +void VersalReadImage::DisplayHeaderTableDetails(ReadImageOption::Type type) { - ReadBinaryFile(dump, dump_dir); - if (dump != DumpOption::NONE) - { - if (iHT->metaHdrKeySource != KeySource::None) - { - switch (dump) - { - case DumpOption::BH: - break; - - case DumpOption::PLM: - LOG_ERROR("Cannot dump PLM from an encrypted PDI."); - break; - - case DumpOption::PMC_CDO: - LOG_ERROR("Cannot dump PMC_CDO from an encrypted PDI."); - break; - - case DumpOption::PARTITIONS: - LOG_ERROR("Cannot dump partitions from an encrypted PDI."); - break; - - case DumpOption::BOOT_FILES: - LOG_MSG("\n[INFO] : Cannot dump PLM/ PMC_CDO/ partitions from an encrypted PDI."); - break; - - default: - break; - } - } - return; - } - switch (type) { case ReadImageOption::BH: @@ -438,6 +431,46 @@ } /******************************************************************************/ +void VersalReadImage::DisplayImageDetails(ReadImageOption::Type type, DumpOption::Type dump, std::string dump_dir) +{ + readType = type; + + ReadBinaryFile(dump, dump_dir); + + if (dump != DumpOption::NONE) + { + if (iHT->metaHdrKeySource != KeySource::None) + { + switch (dump) + { + case DumpOption::BH: + break; + + case DumpOption::PLM: + LOG_ERROR("Cannot dump PLM from an encrypted PDI."); + break; + + case DumpOption::PMC_CDO: + LOG_ERROR("Cannot dump PMC_CDO from an encrypted PDI."); + break; + + case DumpOption::PARTITIONS: + LOG_ERROR("Cannot dump partitions from an encrypted PDI."); + break; + + case DumpOption::BOOT_FILES: + LOG_MSG("\n[INFO] : Cannot dump PLM/ PMC_CDO/ partitions from an encrypted PDI."); + break; + + default: + break; + } + } + return; + } +} + +/******************************************************************************/ void VersalReadImage::DisplayBootHeader(void) { Separator(); @@ -880,7 +913,7 @@ { uint32_t core = (value >> vphtDestCpuShift) & vphtDestCpuMask; uint32_t arch = (value >> vphtExecStateShift) & vphtExecStateMask; - uint32_t is_a72 = (core == 1 || core == 2 || core == 3 || core == 4); + uint32_t is_a72 = (core == 1 || core == 2); bool is_armv8 = (arch == 0 && is_a72 == 1); bool is_armv7 = ((arch == 1 && is_a72 == 1) || core == 5 || core == 6 || core == 7); bool is_elf = (((value >> vphtPartitionTypeShift) & vphtPartitionTypeMask) == 1); @@ -926,13 +959,11 @@ case 0: val = "[none]"; break; case 1: val = "[a72-0]"; break; case 2: val = "[a72-1]"; break; - case 3: val = "[a72-2]"; break; - case 4: val = "[a72-3]"; break; case 5: val = "[r5-0]"; break; case 6: val = "[r5-1]"; break; case 7: val = "[r5-lockstep]"; break; case 8: val = "[psm]"; break; - case 9: val = "[me]"; break; + case 9: val = "[aie]"; break; default: val = "[invalid]"; break; } if (!is_elf) diff -Nru xilinx-bootgen-2021.2/readimage-versal.h xilinx-bootgen-2022.1/readimage-versal.h --- xilinx-bootgen-2021.2/readimage-versal.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/readimage-versal.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -59,6 +59,7 @@ bH = NULL; iHT = NULL; dumpType = DumpOption::NONE; + readType = ReadImageOption::NONE; iHs.clear(); pHTs.clear(); partitionBuffers.clear(); @@ -68,7 +69,10 @@ ~VersalReadImage(); void ReadBinaryFile(DumpOption::Type dump=DumpOption::NONE, std::string path=""); + void ReadHeaderTableDetails(); + void ReadPartitions(); void DisplayImageDetails(ReadImageOption::Type type, DumpOption::Type dump, std::string path=""); + void DisplayHeaderTableDetails(ReadImageOption::Type type); void DisplayBootHeader(void); void DisplayImageHeaderTable(void); void DisplayImageHeaders(void); @@ -97,6 +101,7 @@ protected: std::string binFilename; DumpOption::Type dumpType; + ReadImageOption::Type readType; std::string dumpPath; VersalBootHeaderStructure* bH; VersalImageHeaderTableStructure* iHT; diff -Nru xilinx-bootgen-2021.2/readimage-zynq.cpp xilinx-bootgen-2022.1/readimage-zynq.cpp --- xilinx-bootgen-2021.2/readimage-zynq.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/readimage-zynq.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2020 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -85,6 +85,10 @@ { LOG_ERROR("Error reading Image header table"); } + if (!((iHT->partitionTotalCount > 0) && (iHT->partitionTotalCount < 0xFF))) + { + LOG_ERROR("Number of partitions read is more than number of supported partiiton count."); + } } else { diff -Nru xilinx-bootgen-2021.2/readimage-zynqmp.cpp xilinx-bootgen-2022.1/readimage-zynqmp.cpp --- xilinx-bootgen-2021.2/readimage-zynqmp.cpp 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/readimage-zynqmp.cpp 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2021 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -87,6 +87,10 @@ { LOG_ERROR("Error reading Image header table"); } + if (!((iHT->partitionTotalCount > 0) && (iHT->partitionTotalCount < 0xFF))) + { + LOG_ERROR("Number of partitions read is more than number of supported partiiton count."); + } } else { diff -Nru xilinx-bootgen-2021.2/version.h xilinx-bootgen-2022.1/version.h --- xilinx-bootgen-2021.2/version.h 2021-09-30 06:08:18.000000000 +0000 +++ xilinx-bootgen-2022.1/version.h 2022-03-30 09:29:13.000000000 +0000 @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright 2015-2020 Xilinx, Inc. +* Copyright 2015-2022 Xilinx, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,11 +15,11 @@ ******************************************************************************/ #ifndef RDI_VERSION -#define RDI_VERSION "2021.2" +#define RDI_VERSION "2022.1" #endif #define PROGRAMNAME "Xilinx Bootgen" -#define COPYRIGHT "Copyright (c) 1995-2021 Xilinx, Inc. All rights reserved.\n" +#define COPYRIGHT "Copyright (c) 1986-2022 Xilinx, Inc. All rights reserved.\n" /****************************************************************************** @@ -46,6 +46,7 @@ log - Generate log file |\n\ nonbooting - Generate an intermediate boot image |\n\ o - Output filename in MCS/BIN format |\n\ + overlay_cdo - Overlay CDO files of Boot Image File |\n\ p - Part name for generating nky file |\n\ padimageheader - Pad header tables |\n\ process_bitstream - Outputs bitstream in bin/mcs format |\n\