diff options
| -rw-r--r-- | pyGHDL/libghdl/vhdl/nodes.py | 564 | ||||
| -rw-r--r-- | src/vhdl/vhdl-ieee-numeric.adb | 20 | ||||
| -rw-r--r-- | src/vhdl/vhdl-nodes.ads | 4 |
3 files changed, 304 insertions, 284 deletions
diff --git a/pyGHDL/libghdl/vhdl/nodes.py b/pyGHDL/libghdl/vhdl/nodes.py index 9b8a9208f..0ed86c49b 100644 --- a/pyGHDL/libghdl/vhdl/nodes.py +++ b/pyGHDL/libghdl/vhdl/nodes.py @@ -1539,286 +1539,290 @@ class Iir_Predefined(IntEnum): Ieee_Numeric_Std_Sla_Sgn_Int = 376 Ieee_Numeric_Std_Sra_Uns_Int = 377 Ieee_Numeric_Std_Sra_Sgn_Int = 378 - Ieee_Numeric_Std_And_Uns_Uns = 379 - Ieee_Numeric_Std_And_Sgn_Sgn = 380 - Ieee_Numeric_Std_Or_Uns_Uns = 381 - Ieee_Numeric_Std_Or_Sgn_Sgn = 382 - Ieee_Numeric_Std_Nand_Uns_Uns = 383 - Ieee_Numeric_Std_Nand_Sgn_Sgn = 384 - Ieee_Numeric_Std_Nor_Uns_Uns = 385 - Ieee_Numeric_Std_Nor_Sgn_Sgn = 386 - Ieee_Numeric_Std_Xor_Uns_Uns = 387 - Ieee_Numeric_Std_Xor_Sgn_Sgn = 388 - Ieee_Numeric_Std_Xnor_Uns_Uns = 389 - Ieee_Numeric_Std_Xnor_Sgn_Sgn = 390 - Ieee_Numeric_Std_Not_Uns = 391 - Ieee_Numeric_Std_Not_Sgn = 392 - Ieee_Numeric_Std_Abs_Sgn = 393 - Ieee_Numeric_Std_Neg_Uns = 394 - Ieee_Numeric_Std_Neg_Sgn = 395 - Ieee_Numeric_Std_Min_Uns_Uns = 396 - Ieee_Numeric_Std_Min_Uns_Nat = 397 - Ieee_Numeric_Std_Min_Nat_Uns = 398 - Ieee_Numeric_Std_Min_Sgn_Sgn = 399 - Ieee_Numeric_Std_Min_Sgn_Int = 400 - Ieee_Numeric_Std_Min_Int_Sgn = 401 - Ieee_Numeric_Std_Max_Uns_Uns = 402 - Ieee_Numeric_Std_Max_Uns_Nat = 403 - Ieee_Numeric_Std_Max_Nat_Uns = 404 - Ieee_Numeric_Std_Max_Sgn_Sgn = 405 - Ieee_Numeric_Std_Max_Sgn_Int = 406 - Ieee_Numeric_Std_Max_Int_Sgn = 407 - Ieee_Numeric_Std_Shf_Left_Uns_Nat = 408 - Ieee_Numeric_Std_Shf_Right_Uns_Nat = 409 - Ieee_Numeric_Std_Shf_Left_Sgn_Nat = 410 - Ieee_Numeric_Std_Shf_Right_Sgn_Nat = 411 - Ieee_Numeric_Std_Rot_Left_Uns_Nat = 412 - Ieee_Numeric_Std_Rot_Right_Uns_Nat = 413 - Ieee_Numeric_Std_Rot_Left_Sgn_Nat = 414 - Ieee_Numeric_Std_Rot_Right_Sgn_Nat = 415 - Ieee_Numeric_Std_And_Sgn = 416 - Ieee_Numeric_Std_Nand_Sgn = 417 - Ieee_Numeric_Std_Or_Sgn = 418 - Ieee_Numeric_Std_Nor_Sgn = 419 - Ieee_Numeric_Std_Xor_Sgn = 420 - Ieee_Numeric_Std_Xnor_Sgn = 421 - Ieee_Numeric_Std_And_Uns = 422 - Ieee_Numeric_Std_Nand_Uns = 423 - Ieee_Numeric_Std_Or_Uns = 424 - Ieee_Numeric_Std_Nor_Uns = 425 - Ieee_Numeric_Std_Xor_Uns = 426 - Ieee_Numeric_Std_Xnor_Uns = 427 - Ieee_Numeric_Std_Find_Leftmost_Uns = 428 - Ieee_Numeric_Std_Find_Rightmost_Uns = 429 - Ieee_Numeric_Std_Find_Leftmost_Sgn = 430 - Ieee_Numeric_Std_Find_Rightmost_Sgn = 431 - Ieee_Numeric_Std_Match_Log = 432 - Ieee_Numeric_Std_Match_Uns = 433 - Ieee_Numeric_Std_Match_Sgn = 434 - Ieee_Numeric_Std_Match_Slv = 435 - Ieee_Numeric_Std_Match_Suv = 436 - Ieee_Numeric_Std_To_01_Uns = 437 - Ieee_Numeric_Std_To_01_Sgn = 438 - Ieee_Numeric_Std_Unsigned_To_Integer_Slv_Nat = 439 - Ieee_Numeric_Std_Unsigned_To_Slv_Nat_Nat_Slv = 440 - Ieee_Math_Real_Ceil = 441 - Ieee_Math_Real_Floor = 442 - Ieee_Math_Real_Round = 443 - Ieee_Math_Real_Log2 = 444 - Ieee_Math_Real_Sin = 445 - Ieee_Math_Real_Cos = 446 - Ieee_Math_Real_Arctan = 447 - Ieee_Math_Real_Pow = 448 - Ieee_Std_Logic_Unsigned_Add_Slv_Slv = 449 - Ieee_Std_Logic_Unsigned_Add_Slv_Int = 450 - Ieee_Std_Logic_Unsigned_Add_Int_Slv = 451 - Ieee_Std_Logic_Unsigned_Add_Slv_Log = 452 - Ieee_Std_Logic_Unsigned_Add_Log_Slv = 453 - Ieee_Std_Logic_Unsigned_Sub_Slv_Slv = 454 - Ieee_Std_Logic_Unsigned_Sub_Slv_Int = 455 - Ieee_Std_Logic_Unsigned_Sub_Int_Slv = 456 - Ieee_Std_Logic_Unsigned_Sub_Slv_Log = 457 - Ieee_Std_Logic_Unsigned_Sub_Log_Slv = 458 - Ieee_Std_Logic_Unsigned_Id_Slv = 459 - Ieee_Std_Logic_Unsigned_Mul_Slv_Slv = 460 - Ieee_Std_Logic_Unsigned_Lt_Slv_Slv = 461 - Ieee_Std_Logic_Unsigned_Lt_Slv_Int = 462 - Ieee_Std_Logic_Unsigned_Lt_Int_Slv = 463 - Ieee_Std_Logic_Unsigned_Le_Slv_Slv = 464 - Ieee_Std_Logic_Unsigned_Le_Slv_Int = 465 - Ieee_Std_Logic_Unsigned_Le_Int_Slv = 466 - Ieee_Std_Logic_Unsigned_Gt_Slv_Slv = 467 - Ieee_Std_Logic_Unsigned_Gt_Slv_Int = 468 - Ieee_Std_Logic_Unsigned_Gt_Int_Slv = 469 - Ieee_Std_Logic_Unsigned_Ge_Slv_Slv = 470 - Ieee_Std_Logic_Unsigned_Ge_Slv_Int = 471 - Ieee_Std_Logic_Unsigned_Ge_Int_Slv = 472 - Ieee_Std_Logic_Unsigned_Eq_Slv_Slv = 473 - Ieee_Std_Logic_Unsigned_Eq_Slv_Int = 474 - Ieee_Std_Logic_Unsigned_Eq_Int_Slv = 475 - Ieee_Std_Logic_Unsigned_Ne_Slv_Slv = 476 - Ieee_Std_Logic_Unsigned_Ne_Slv_Int = 477 - Ieee_Std_Logic_Unsigned_Ne_Int_Slv = 478 - Ieee_Std_Logic_Unsigned_Conv_Integer = 479 - Ieee_Std_Logic_Unsigned_Shl = 480 - Ieee_Std_Logic_Unsigned_Shr = 481 - Ieee_Std_Logic_Signed_Add_Slv_Slv = 482 - Ieee_Std_Logic_Signed_Add_Slv_Int = 483 - Ieee_Std_Logic_Signed_Add_Int_Slv = 484 - Ieee_Std_Logic_Signed_Add_Slv_Log = 485 - Ieee_Std_Logic_Signed_Add_Log_Slv = 486 - Ieee_Std_Logic_Signed_Sub_Slv_Slv = 487 - Ieee_Std_Logic_Signed_Sub_Slv_Int = 488 - Ieee_Std_Logic_Signed_Sub_Int_Slv = 489 - Ieee_Std_Logic_Signed_Sub_Slv_Log = 490 - Ieee_Std_Logic_Signed_Sub_Log_Slv = 491 - Ieee_Std_Logic_Signed_Id_Slv = 492 - Ieee_Std_Logic_Signed_Neg_Slv = 493 - Ieee_Std_Logic_Signed_Abs_Slv = 494 - Ieee_Std_Logic_Signed_Mul_Slv_Slv = 495 - Ieee_Std_Logic_Signed_Lt_Slv_Slv = 496 - Ieee_Std_Logic_Signed_Lt_Slv_Int = 497 - Ieee_Std_Logic_Signed_Lt_Int_Slv = 498 - Ieee_Std_Logic_Signed_Le_Slv_Slv = 499 - Ieee_Std_Logic_Signed_Le_Slv_Int = 500 - Ieee_Std_Logic_Signed_Le_Int_Slv = 501 - Ieee_Std_Logic_Signed_Gt_Slv_Slv = 502 - Ieee_Std_Logic_Signed_Gt_Slv_Int = 503 - Ieee_Std_Logic_Signed_Gt_Int_Slv = 504 - Ieee_Std_Logic_Signed_Ge_Slv_Slv = 505 - Ieee_Std_Logic_Signed_Ge_Slv_Int = 506 - Ieee_Std_Logic_Signed_Ge_Int_Slv = 507 - Ieee_Std_Logic_Signed_Eq_Slv_Slv = 508 - Ieee_Std_Logic_Signed_Eq_Slv_Int = 509 - Ieee_Std_Logic_Signed_Eq_Int_Slv = 510 - Ieee_Std_Logic_Signed_Ne_Slv_Slv = 511 - Ieee_Std_Logic_Signed_Ne_Slv_Int = 512 - Ieee_Std_Logic_Signed_Ne_Int_Slv = 513 - Ieee_Std_Logic_Signed_Conv_Integer = 514 - Ieee_Std_Logic_Signed_Shl = 515 - Ieee_Std_Logic_Signed_Shr = 516 - Ieee_Std_Logic_Arith_Conv_Unsigned_Int = 517 - Ieee_Std_Logic_Arith_Conv_Unsigned_Uns = 518 - Ieee_Std_Logic_Arith_Conv_Unsigned_Sgn = 519 - Ieee_Std_Logic_Arith_Conv_Unsigned_Log = 520 - Ieee_Std_Logic_Arith_Conv_Integer_Int = 521 - Ieee_Std_Logic_Arith_Conv_Integer_Uns = 522 - Ieee_Std_Logic_Arith_Conv_Integer_Sgn = 523 - Ieee_Std_Logic_Arith_Conv_Integer_Log = 524 - Ieee_Std_Logic_Arith_Conv_Vector_Int = 525 - Ieee_Std_Logic_Arith_Conv_Vector_Uns = 526 - Ieee_Std_Logic_Arith_Conv_Vector_Sgn = 527 - Ieee_Std_Logic_Arith_Conv_Vector_Log = 528 - Ieee_Std_Logic_Arith_Ext = 529 - Ieee_Std_Logic_Arith_Sxt = 530 - Ieee_Std_Logic_Arith_Id_Uns_Uns = 531 - Ieee_Std_Logic_Arith_Id_Sgn_Sgn = 532 - Ieee_Std_Logic_Arith_Neg_Sgn_Sgn = 533 - Ieee_Std_Logic_Arith_Abs_Sgn_Sgn = 534 - Ieee_Std_Logic_Arith_Shl_Uns = 535 - Ieee_Std_Logic_Arith_Shl_Sgn = 536 - Ieee_Std_Logic_Arith_Shr_Uns = 537 - Ieee_Std_Logic_Arith_Shr_Sgn = 538 - Ieee_Std_Logic_Arith_Id_Uns_Slv = 539 - Ieee_Std_Logic_Arith_Id_Sgn_Slv = 540 - Ieee_Std_Logic_Arith_Neg_Sgn_Slv = 541 - Ieee_Std_Logic_Arith_Abs_Sgn_Slv = 542 - Ieee_Std_Logic_Arith_Mul_Uns_Uns_Uns = 543 - Ieee_Std_Logic_Arith_Mul_Sgn_Sgn_Sgn = 544 - Ieee_Std_Logic_Arith_Mul_Sgn_Uns_Sgn = 545 - Ieee_Std_Logic_Arith_Mul_Uns_Sgn_Sgn = 546 - Ieee_Std_Logic_Arith_Mul_Uns_Uns_Slv = 547 - Ieee_Std_Logic_Arith_Mul_Sgn_Sgn_Slv = 548 - Ieee_Std_Logic_Arith_Mul_Sgn_Uns_Slv = 549 - Ieee_Std_Logic_Arith_Mul_Uns_Sgn_Slv = 550 - Ieee_Std_Logic_Arith_Add_Uns_Uns_Uns = 551 - Ieee_Std_Logic_Arith_Add_Sgn_Sgn_Sgn = 552 - Ieee_Std_Logic_Arith_Add_Uns_Sgn_Sgn = 553 - Ieee_Std_Logic_Arith_Add_Sgn_Uns_Sgn = 554 - Ieee_Std_Logic_Arith_Add_Uns_Int_Uns = 555 - Ieee_Std_Logic_Arith_Add_Int_Uns_Uns = 556 - Ieee_Std_Logic_Arith_Add_Sgn_Int_Sgn = 557 - Ieee_Std_Logic_Arith_Add_Int_Sgn_Sgn = 558 - Ieee_Std_Logic_Arith_Add_Uns_Log_Uns = 559 - Ieee_Std_Logic_Arith_Add_Log_Uns_Uns = 560 - Ieee_Std_Logic_Arith_Add_Sgn_Log_Sgn = 561 - Ieee_Std_Logic_Arith_Add_Log_Sgn_Sgn = 562 - Ieee_Std_Logic_Arith_Add_Uns_Uns_Slv = 563 - Ieee_Std_Logic_Arith_Add_Sgn_Sgn_Slv = 564 - Ieee_Std_Logic_Arith_Add_Uns_Sgn_Slv = 565 - Ieee_Std_Logic_Arith_Add_Sgn_Uns_Slv = 566 - Ieee_Std_Logic_Arith_Add_Uns_Int_Slv = 567 - Ieee_Std_Logic_Arith_Add_Int_Uns_Slv = 568 - Ieee_Std_Logic_Arith_Add_Sgn_Int_Slv = 569 - Ieee_Std_Logic_Arith_Add_Int_Sgn_Slv = 570 - Ieee_Std_Logic_Arith_Add_Uns_Log_Slv = 571 - Ieee_Std_Logic_Arith_Add_Log_Uns_Slv = 572 - Ieee_Std_Logic_Arith_Add_Sgn_Log_Slv = 573 - Ieee_Std_Logic_Arith_Add_Log_Sgn_Slv = 574 - Ieee_Std_Logic_Arith_Sub_Uns_Uns_Uns = 575 - Ieee_Std_Logic_Arith_Sub_Sgn_Sgn_Sgn = 576 - Ieee_Std_Logic_Arith_Sub_Uns_Sgn_Sgn = 577 - Ieee_Std_Logic_Arith_Sub_Sgn_Uns_Sgn = 578 - Ieee_Std_Logic_Arith_Sub_Uns_Int_Uns = 579 - Ieee_Std_Logic_Arith_Sub_Int_Uns_Uns = 580 - Ieee_Std_Logic_Arith_Sub_Sgn_Int_Sgn = 581 - Ieee_Std_Logic_Arith_Sub_Int_Sgn_Sgn = 582 - Ieee_Std_Logic_Arith_Sub_Uns_Log_Uns = 583 - Ieee_Std_Logic_Arith_Sub_Log_Uns_Uns = 584 - Ieee_Std_Logic_Arith_Sub_Sgn_Log_Sgn = 585 - Ieee_Std_Logic_Arith_Sub_Log_Sgn_Sgn = 586 - Ieee_Std_Logic_Arith_Sub_Uns_Uns_Slv = 587 - Ieee_Std_Logic_Arith_Sub_Sgn_Sgn_Slv = 588 - Ieee_Std_Logic_Arith_Sub_Uns_Sgn_Slv = 589 - Ieee_Std_Logic_Arith_Sub_Sgn_Uns_Slv = 590 - Ieee_Std_Logic_Arith_Sub_Uns_Int_Slv = 591 - Ieee_Std_Logic_Arith_Sub_Int_Uns_Slv = 592 - Ieee_Std_Logic_Arith_Sub_Sgn_Int_Slv = 593 - Ieee_Std_Logic_Arith_Sub_Int_Sgn_Slv = 594 - Ieee_Std_Logic_Arith_Sub_Uns_Log_Slv = 595 - Ieee_Std_Logic_Arith_Sub_Log_Uns_Slv = 596 - Ieee_Std_Logic_Arith_Sub_Sgn_Log_Slv = 597 - Ieee_Std_Logic_Arith_Sub_Log_Sgn_Slv = 598 - Ieee_Std_Logic_Arith_Lt_Uns_Uns = 599 - Ieee_Std_Logic_Arith_Lt_Sgn_Sgn = 600 - Ieee_Std_Logic_Arith_Lt_Uns_Sgn = 601 - Ieee_Std_Logic_Arith_Lt_Sgn_Uns = 602 - Ieee_Std_Logic_Arith_Lt_Uns_Int = 603 - Ieee_Std_Logic_Arith_Lt_Int_Uns = 604 - Ieee_Std_Logic_Arith_Lt_Sgn_Int = 605 - Ieee_Std_Logic_Arith_Lt_Int_Sgn = 606 - Ieee_Std_Logic_Arith_Le_Uns_Uns = 607 - Ieee_Std_Logic_Arith_Le_Sgn_Sgn = 608 - Ieee_Std_Logic_Arith_Le_Uns_Sgn = 609 - Ieee_Std_Logic_Arith_Le_Sgn_Uns = 610 - Ieee_Std_Logic_Arith_Le_Uns_Int = 611 - Ieee_Std_Logic_Arith_Le_Int_Uns = 612 - Ieee_Std_Logic_Arith_Le_Sgn_Int = 613 - Ieee_Std_Logic_Arith_Le_Int_Sgn = 614 - Ieee_Std_Logic_Arith_Gt_Uns_Uns = 615 - Ieee_Std_Logic_Arith_Gt_Sgn_Sgn = 616 - Ieee_Std_Logic_Arith_Gt_Uns_Sgn = 617 - Ieee_Std_Logic_Arith_Gt_Sgn_Uns = 618 - Ieee_Std_Logic_Arith_Gt_Uns_Int = 619 - Ieee_Std_Logic_Arith_Gt_Int_Uns = 620 - Ieee_Std_Logic_Arith_Gt_Sgn_Int = 621 - Ieee_Std_Logic_Arith_Gt_Int_Sgn = 622 - Ieee_Std_Logic_Arith_Ge_Uns_Uns = 623 - Ieee_Std_Logic_Arith_Ge_Sgn_Sgn = 624 - Ieee_Std_Logic_Arith_Ge_Uns_Sgn = 625 - Ieee_Std_Logic_Arith_Ge_Sgn_Uns = 626 - Ieee_Std_Logic_Arith_Ge_Uns_Int = 627 - Ieee_Std_Logic_Arith_Ge_Int_Uns = 628 - Ieee_Std_Logic_Arith_Ge_Sgn_Int = 629 - Ieee_Std_Logic_Arith_Ge_Int_Sgn = 630 - Ieee_Std_Logic_Arith_Eq_Uns_Uns = 631 - Ieee_Std_Logic_Arith_Eq_Sgn_Sgn = 632 - Ieee_Std_Logic_Arith_Eq_Uns_Sgn = 633 - Ieee_Std_Logic_Arith_Eq_Sgn_Uns = 634 - Ieee_Std_Logic_Arith_Eq_Uns_Int = 635 - Ieee_Std_Logic_Arith_Eq_Int_Uns = 636 - Ieee_Std_Logic_Arith_Eq_Sgn_Int = 637 - Ieee_Std_Logic_Arith_Eq_Int_Sgn = 638 - Ieee_Std_Logic_Arith_Ne_Uns_Uns = 639 - Ieee_Std_Logic_Arith_Ne_Sgn_Sgn = 640 - Ieee_Std_Logic_Arith_Ne_Uns_Sgn = 641 - Ieee_Std_Logic_Arith_Ne_Sgn_Uns = 642 - Ieee_Std_Logic_Arith_Ne_Uns_Int = 643 - Ieee_Std_Logic_Arith_Ne_Int_Uns = 644 - Ieee_Std_Logic_Arith_Ne_Sgn_Int = 645 - Ieee_Std_Logic_Arith_Ne_Int_Sgn = 646 - Ieee_Std_Logic_Misc_And_Reduce_Slv = 647 - Ieee_Std_Logic_Misc_And_Reduce_Suv = 648 - Ieee_Std_Logic_Misc_Nand_Reduce_Slv = 649 - Ieee_Std_Logic_Misc_Nand_Reduce_Suv = 650 - Ieee_Std_Logic_Misc_Or_Reduce_Slv = 651 - Ieee_Std_Logic_Misc_Or_Reduce_Suv = 652 - Ieee_Std_Logic_Misc_Nor_Reduce_Slv = 653 - Ieee_Std_Logic_Misc_Nor_Reduce_Suv = 654 - Ieee_Std_Logic_Misc_Xor_Reduce_Slv = 655 - Ieee_Std_Logic_Misc_Xor_Reduce_Suv = 656 - Ieee_Std_Logic_Misc_Xnor_Reduce_Slv = 657 - Ieee_Std_Logic_Misc_Xnor_Reduce_Suv = 658 + Ieee_Numeric_Std_Rol_Uns_Int = 379 + Ieee_Numeric_Std_Rol_Sgn_Int = 380 + Ieee_Numeric_Std_Ror_Uns_Int = 381 + Ieee_Numeric_Std_Ror_Sgn_Int = 382 + Ieee_Numeric_Std_And_Uns_Uns = 383 + Ieee_Numeric_Std_And_Sgn_Sgn = 384 + Ieee_Numeric_Std_Or_Uns_Uns = 385 + Ieee_Numeric_Std_Or_Sgn_Sgn = 386 + Ieee_Numeric_Std_Nand_Uns_Uns = 387 + Ieee_Numeric_Std_Nand_Sgn_Sgn = 388 + Ieee_Numeric_Std_Nor_Uns_Uns = 389 + Ieee_Numeric_Std_Nor_Sgn_Sgn = 390 + Ieee_Numeric_Std_Xor_Uns_Uns = 391 + Ieee_Numeric_Std_Xor_Sgn_Sgn = 392 + Ieee_Numeric_Std_Xnor_Uns_Uns = 393 + Ieee_Numeric_Std_Xnor_Sgn_Sgn = 394 + Ieee_Numeric_Std_Not_Uns = 395 + Ieee_Numeric_Std_Not_Sgn = 396 + Ieee_Numeric_Std_Abs_Sgn = 397 + Ieee_Numeric_Std_Neg_Uns = 398 + Ieee_Numeric_Std_Neg_Sgn = 399 + Ieee_Numeric_Std_Min_Uns_Uns = 400 + Ieee_Numeric_Std_Min_Uns_Nat = 401 + Ieee_Numeric_Std_Min_Nat_Uns = 402 + Ieee_Numeric_Std_Min_Sgn_Sgn = 403 + Ieee_Numeric_Std_Min_Sgn_Int = 404 + Ieee_Numeric_Std_Min_Int_Sgn = 405 + Ieee_Numeric_Std_Max_Uns_Uns = 406 + Ieee_Numeric_Std_Max_Uns_Nat = 407 + Ieee_Numeric_Std_Max_Nat_Uns = 408 + Ieee_Numeric_Std_Max_Sgn_Sgn = 409 + Ieee_Numeric_Std_Max_Sgn_Int = 410 + Ieee_Numeric_Std_Max_Int_Sgn = 411 + Ieee_Numeric_Std_Shf_Left_Uns_Nat = 412 + Ieee_Numeric_Std_Shf_Right_Uns_Nat = 413 + Ieee_Numeric_Std_Shf_Left_Sgn_Nat = 414 + Ieee_Numeric_Std_Shf_Right_Sgn_Nat = 415 + Ieee_Numeric_Std_Rot_Left_Uns_Nat = 416 + Ieee_Numeric_Std_Rot_Right_Uns_Nat = 417 + Ieee_Numeric_Std_Rot_Left_Sgn_Nat = 418 + Ieee_Numeric_Std_Rot_Right_Sgn_Nat = 419 + Ieee_Numeric_Std_And_Sgn = 420 + Ieee_Numeric_Std_Nand_Sgn = 421 + Ieee_Numeric_Std_Or_Sgn = 422 + Ieee_Numeric_Std_Nor_Sgn = 423 + Ieee_Numeric_Std_Xor_Sgn = 424 + Ieee_Numeric_Std_Xnor_Sgn = 425 + Ieee_Numeric_Std_And_Uns = 426 + Ieee_Numeric_Std_Nand_Uns = 427 + Ieee_Numeric_Std_Or_Uns = 428 + Ieee_Numeric_Std_Nor_Uns = 429 + Ieee_Numeric_Std_Xor_Uns = 430 + Ieee_Numeric_Std_Xnor_Uns = 431 + Ieee_Numeric_Std_Find_Leftmost_Uns = 432 + Ieee_Numeric_Std_Find_Rightmost_Uns = 433 + Ieee_Numeric_Std_Find_Leftmost_Sgn = 434 + Ieee_Numeric_Std_Find_Rightmost_Sgn = 435 + Ieee_Numeric_Std_Match_Log = 436 + Ieee_Numeric_Std_Match_Uns = 437 + Ieee_Numeric_Std_Match_Sgn = 438 + Ieee_Numeric_Std_Match_Slv = 439 + Ieee_Numeric_Std_Match_Suv = 440 + Ieee_Numeric_Std_To_01_Uns = 441 + Ieee_Numeric_Std_To_01_Sgn = 442 + Ieee_Numeric_Std_Unsigned_To_Integer_Slv_Nat = 443 + Ieee_Numeric_Std_Unsigned_To_Slv_Nat_Nat_Slv = 444 + Ieee_Math_Real_Ceil = 445 + Ieee_Math_Real_Floor = 446 + Ieee_Math_Real_Round = 447 + Ieee_Math_Real_Log2 = 448 + Ieee_Math_Real_Sin = 449 + Ieee_Math_Real_Cos = 450 + Ieee_Math_Real_Arctan = 451 + Ieee_Math_Real_Pow = 452 + Ieee_Std_Logic_Unsigned_Add_Slv_Slv = 453 + Ieee_Std_Logic_Unsigned_Add_Slv_Int = 454 + Ieee_Std_Logic_Unsigned_Add_Int_Slv = 455 + Ieee_Std_Logic_Unsigned_Add_Slv_Log = 456 + Ieee_Std_Logic_Unsigned_Add_Log_Slv = 457 + Ieee_Std_Logic_Unsigned_Sub_Slv_Slv = 458 + Ieee_Std_Logic_Unsigned_Sub_Slv_Int = 459 + Ieee_Std_Logic_Unsigned_Sub_Int_Slv = 460 + Ieee_Std_Logic_Unsigned_Sub_Slv_Log = 461 + Ieee_Std_Logic_Unsigned_Sub_Log_Slv = 462 + Ieee_Std_Logic_Unsigned_Id_Slv = 463 + Ieee_Std_Logic_Unsigned_Mul_Slv_Slv = 464 + Ieee_Std_Logic_Unsigned_Lt_Slv_Slv = 465 + Ieee_Std_Logic_Unsigned_Lt_Slv_Int = 466 + Ieee_Std_Logic_Unsigned_Lt_Int_Slv = 467 + Ieee_Std_Logic_Unsigned_Le_Slv_Slv = 468 + Ieee_Std_Logic_Unsigned_Le_Slv_Int = 469 + Ieee_Std_Logic_Unsigned_Le_Int_Slv = 470 + Ieee_Std_Logic_Unsigned_Gt_Slv_Slv = 471 + Ieee_Std_Logic_Unsigned_Gt_Slv_Int = 472 + Ieee_Std_Logic_Unsigned_Gt_Int_Slv = 473 + Ieee_Std_Logic_Unsigned_Ge_Slv_Slv = 474 + Ieee_Std_Logic_Unsigned_Ge_Slv_Int = 475 + Ieee_Std_Logic_Unsigned_Ge_Int_Slv = 476 + Ieee_Std_Logic_Unsigned_Eq_Slv_Slv = 477 + Ieee_Std_Logic_Unsigned_Eq_Slv_Int = 478 + Ieee_Std_Logic_Unsigned_Eq_Int_Slv = 479 + Ieee_Std_Logic_Unsigned_Ne_Slv_Slv = 480 + Ieee_Std_Logic_Unsigned_Ne_Slv_Int = 481 + Ieee_Std_Logic_Unsigned_Ne_Int_Slv = 482 + Ieee_Std_Logic_Unsigned_Conv_Integer = 483 + Ieee_Std_Logic_Unsigned_Shl = 484 + Ieee_Std_Logic_Unsigned_Shr = 485 + Ieee_Std_Logic_Signed_Add_Slv_Slv = 486 + Ieee_Std_Logic_Signed_Add_Slv_Int = 487 + Ieee_Std_Logic_Signed_Add_Int_Slv = 488 + Ieee_Std_Logic_Signed_Add_Slv_Log = 489 + Ieee_Std_Logic_Signed_Add_Log_Slv = 490 + Ieee_Std_Logic_Signed_Sub_Slv_Slv = 491 + Ieee_Std_Logic_Signed_Sub_Slv_Int = 492 + Ieee_Std_Logic_Signed_Sub_Int_Slv = 493 + Ieee_Std_Logic_Signed_Sub_Slv_Log = 494 + Ieee_Std_Logic_Signed_Sub_Log_Slv = 495 + Ieee_Std_Logic_Signed_Id_Slv = 496 + Ieee_Std_Logic_Signed_Neg_Slv = 497 + Ieee_Std_Logic_Signed_Abs_Slv = 498 + Ieee_Std_Logic_Signed_Mul_Slv_Slv = 499 + Ieee_Std_Logic_Signed_Lt_Slv_Slv = 500 + Ieee_Std_Logic_Signed_Lt_Slv_Int = 501 + Ieee_Std_Logic_Signed_Lt_Int_Slv = 502 + Ieee_Std_Logic_Signed_Le_Slv_Slv = 503 + Ieee_Std_Logic_Signed_Le_Slv_Int = 504 + Ieee_Std_Logic_Signed_Le_Int_Slv = 505 + Ieee_Std_Logic_Signed_Gt_Slv_Slv = 506 + Ieee_Std_Logic_Signed_Gt_Slv_Int = 507 + Ieee_Std_Logic_Signed_Gt_Int_Slv = 508 + Ieee_Std_Logic_Signed_Ge_Slv_Slv = 509 + Ieee_Std_Logic_Signed_Ge_Slv_Int = 510 + Ieee_Std_Logic_Signed_Ge_Int_Slv = 511 + Ieee_Std_Logic_Signed_Eq_Slv_Slv = 512 + Ieee_Std_Logic_Signed_Eq_Slv_Int = 513 + Ieee_Std_Logic_Signed_Eq_Int_Slv = 514 + Ieee_Std_Logic_Signed_Ne_Slv_Slv = 515 + Ieee_Std_Logic_Signed_Ne_Slv_Int = 516 + Ieee_Std_Logic_Signed_Ne_Int_Slv = 517 + Ieee_Std_Logic_Signed_Conv_Integer = 518 + Ieee_Std_Logic_Signed_Shl = 519 + Ieee_Std_Logic_Signed_Shr = 520 + Ieee_Std_Logic_Arith_Conv_Unsigned_Int = 521 + Ieee_Std_Logic_Arith_Conv_Unsigned_Uns = 522 + Ieee_Std_Logic_Arith_Conv_Unsigned_Sgn = 523 + Ieee_Std_Logic_Arith_Conv_Unsigned_Log = 524 + Ieee_Std_Logic_Arith_Conv_Integer_Int = 525 + Ieee_Std_Logic_Arith_Conv_Integer_Uns = 526 + Ieee_Std_Logic_Arith_Conv_Integer_Sgn = 527 + Ieee_Std_Logic_Arith_Conv_Integer_Log = 528 + Ieee_Std_Logic_Arith_Conv_Vector_Int = 529 + Ieee_Std_Logic_Arith_Conv_Vector_Uns = 530 + Ieee_Std_Logic_Arith_Conv_Vector_Sgn = 531 + Ieee_Std_Logic_Arith_Conv_Vector_Log = 532 + Ieee_Std_Logic_Arith_Ext = 533 + Ieee_Std_Logic_Arith_Sxt = 534 + Ieee_Std_Logic_Arith_Id_Uns_Uns = 535 + Ieee_Std_Logic_Arith_Id_Sgn_Sgn = 536 + Ieee_Std_Logic_Arith_Neg_Sgn_Sgn = 537 + Ieee_Std_Logic_Arith_Abs_Sgn_Sgn = 538 + Ieee_Std_Logic_Arith_Shl_Uns = 539 + Ieee_Std_Logic_Arith_Shl_Sgn = 540 + Ieee_Std_Logic_Arith_Shr_Uns = 541 + Ieee_Std_Logic_Arith_Shr_Sgn = 542 + Ieee_Std_Logic_Arith_Id_Uns_Slv = 543 + Ieee_Std_Logic_Arith_Id_Sgn_Slv = 544 + Ieee_Std_Logic_Arith_Neg_Sgn_Slv = 545 + Ieee_Std_Logic_Arith_Abs_Sgn_Slv = 546 + Ieee_Std_Logic_Arith_Mul_Uns_Uns_Uns = 547 + Ieee_Std_Logic_Arith_Mul_Sgn_Sgn_Sgn = 548 + Ieee_Std_Logic_Arith_Mul_Sgn_Uns_Sgn = 549 + Ieee_Std_Logic_Arith_Mul_Uns_Sgn_Sgn = 550 + Ieee_Std_Logic_Arith_Mul_Uns_Uns_Slv = 551 + Ieee_Std_Logic_Arith_Mul_Sgn_Sgn_Slv = 552 + Ieee_Std_Logic_Arith_Mul_Sgn_Uns_Slv = 553 + Ieee_Std_Logic_Arith_Mul_Uns_Sgn_Slv = 554 + Ieee_Std_Logic_Arith_Add_Uns_Uns_Uns = 555 + Ieee_Std_Logic_Arith_Add_Sgn_Sgn_Sgn = 556 + Ieee_Std_Logic_Arith_Add_Uns_Sgn_Sgn = 557 + Ieee_Std_Logic_Arith_Add_Sgn_Uns_Sgn = 558 + Ieee_Std_Logic_Arith_Add_Uns_Int_Uns = 559 + Ieee_Std_Logic_Arith_Add_Int_Uns_Uns = 560 + Ieee_Std_Logic_Arith_Add_Sgn_Int_Sgn = 561 + Ieee_Std_Logic_Arith_Add_Int_Sgn_Sgn = 562 + Ieee_Std_Logic_Arith_Add_Uns_Log_Uns = 563 + Ieee_Std_Logic_Arith_Add_Log_Uns_Uns = 564 + Ieee_Std_Logic_Arith_Add_Sgn_Log_Sgn = 565 + Ieee_Std_Logic_Arith_Add_Log_Sgn_Sgn = 566 + Ieee_Std_Logic_Arith_Add_Uns_Uns_Slv = 567 + Ieee_Std_Logic_Arith_Add_Sgn_Sgn_Slv = 568 + Ieee_Std_Logic_Arith_Add_Uns_Sgn_Slv = 569 + Ieee_Std_Logic_Arith_Add_Sgn_Uns_Slv = 570 + Ieee_Std_Logic_Arith_Add_Uns_Int_Slv = 571 + Ieee_Std_Logic_Arith_Add_Int_Uns_Slv = 572 + Ieee_Std_Logic_Arith_Add_Sgn_Int_Slv = 573 + Ieee_Std_Logic_Arith_Add_Int_Sgn_Slv = 574 + Ieee_Std_Logic_Arith_Add_Uns_Log_Slv = 575 + Ieee_Std_Logic_Arith_Add_Log_Uns_Slv = 576 + Ieee_Std_Logic_Arith_Add_Sgn_Log_Slv = 577 + Ieee_Std_Logic_Arith_Add_Log_Sgn_Slv = 578 + Ieee_Std_Logic_Arith_Sub_Uns_Uns_Uns = 579 + Ieee_Std_Logic_Arith_Sub_Sgn_Sgn_Sgn = 580 + Ieee_Std_Logic_Arith_Sub_Uns_Sgn_Sgn = 581 + Ieee_Std_Logic_Arith_Sub_Sgn_Uns_Sgn = 582 + Ieee_Std_Logic_Arith_Sub_Uns_Int_Uns = 583 + Ieee_Std_Logic_Arith_Sub_Int_Uns_Uns = 584 + Ieee_Std_Logic_Arith_Sub_Sgn_Int_Sgn = 585 + Ieee_Std_Logic_Arith_Sub_Int_Sgn_Sgn = 586 + Ieee_Std_Logic_Arith_Sub_Uns_Log_Uns = 587 + Ieee_Std_Logic_Arith_Sub_Log_Uns_Uns = 588 + Ieee_Std_Logic_Arith_Sub_Sgn_Log_Sgn = 589 + Ieee_Std_Logic_Arith_Sub_Log_Sgn_Sgn = 590 + Ieee_Std_Logic_Arith_Sub_Uns_Uns_Slv = 591 + Ieee_Std_Logic_Arith_Sub_Sgn_Sgn_Slv = 592 + Ieee_Std_Logic_Arith_Sub_Uns_Sgn_Slv = 593 + Ieee_Std_Logic_Arith_Sub_Sgn_Uns_Slv = 594 + Ieee_Std_Logic_Arith_Sub_Uns_Int_Slv = 595 + Ieee_Std_Logic_Arith_Sub_Int_Uns_Slv = 596 + Ieee_Std_Logic_Arith_Sub_Sgn_Int_Slv = 597 + Ieee_Std_Logic_Arith_Sub_Int_Sgn_Slv = 598 + Ieee_Std_Logic_Arith_Sub_Uns_Log_Slv = 599 + Ieee_Std_Logic_Arith_Sub_Log_Uns_Slv = 600 + Ieee_Std_Logic_Arith_Sub_Sgn_Log_Slv = 601 + Ieee_Std_Logic_Arith_Sub_Log_Sgn_Slv = 602 + Ieee_Std_Logic_Arith_Lt_Uns_Uns = 603 + Ieee_Std_Logic_Arith_Lt_Sgn_Sgn = 604 + Ieee_Std_Logic_Arith_Lt_Uns_Sgn = 605 + Ieee_Std_Logic_Arith_Lt_Sgn_Uns = 606 + Ieee_Std_Logic_Arith_Lt_Uns_Int = 607 + Ieee_Std_Logic_Arith_Lt_Int_Uns = 608 + Ieee_Std_Logic_Arith_Lt_Sgn_Int = 609 + Ieee_Std_Logic_Arith_Lt_Int_Sgn = 610 + Ieee_Std_Logic_Arith_Le_Uns_Uns = 611 + Ieee_Std_Logic_Arith_Le_Sgn_Sgn = 612 + Ieee_Std_Logic_Arith_Le_Uns_Sgn = 613 + Ieee_Std_Logic_Arith_Le_Sgn_Uns = 614 + Ieee_Std_Logic_Arith_Le_Uns_Int = 615 + Ieee_Std_Logic_Arith_Le_Int_Uns = 616 + Ieee_Std_Logic_Arith_Le_Sgn_Int = 617 + Ieee_Std_Logic_Arith_Le_Int_Sgn = 618 + Ieee_Std_Logic_Arith_Gt_Uns_Uns = 619 + Ieee_Std_Logic_Arith_Gt_Sgn_Sgn = 620 + Ieee_Std_Logic_Arith_Gt_Uns_Sgn = 621 + Ieee_Std_Logic_Arith_Gt_Sgn_Uns = 622 + Ieee_Std_Logic_Arith_Gt_Uns_Int = 623 + Ieee_Std_Logic_Arith_Gt_Int_Uns = 624 + Ieee_Std_Logic_Arith_Gt_Sgn_Int = 625 + Ieee_Std_Logic_Arith_Gt_Int_Sgn = 626 + Ieee_Std_Logic_Arith_Ge_Uns_Uns = 627 + Ieee_Std_Logic_Arith_Ge_Sgn_Sgn = 628 + Ieee_Std_Logic_Arith_Ge_Uns_Sgn = 629 + Ieee_Std_Logic_Arith_Ge_Sgn_Uns = 630 + Ieee_Std_Logic_Arith_Ge_Uns_Int = 631 + Ieee_Std_Logic_Arith_Ge_Int_Uns = 632 + Ieee_Std_Logic_Arith_Ge_Sgn_Int = 633 + Ieee_Std_Logic_Arith_Ge_Int_Sgn = 634 + Ieee_Std_Logic_Arith_Eq_Uns_Uns = 635 + Ieee_Std_Logic_Arith_Eq_Sgn_Sgn = 636 + Ieee_Std_Logic_Arith_Eq_Uns_Sgn = 637 + Ieee_Std_Logic_Arith_Eq_Sgn_Uns = 638 + Ieee_Std_Logic_Arith_Eq_Uns_Int = 639 + Ieee_Std_Logic_Arith_Eq_Int_Uns = 640 + Ieee_Std_Logic_Arith_Eq_Sgn_Int = 641 + Ieee_Std_Logic_Arith_Eq_Int_Sgn = 642 + Ieee_Std_Logic_Arith_Ne_Uns_Uns = 643 + Ieee_Std_Logic_Arith_Ne_Sgn_Sgn = 644 + Ieee_Std_Logic_Arith_Ne_Uns_Sgn = 645 + Ieee_Std_Logic_Arith_Ne_Sgn_Uns = 646 + Ieee_Std_Logic_Arith_Ne_Uns_Int = 647 + Ieee_Std_Logic_Arith_Ne_Int_Uns = 648 + Ieee_Std_Logic_Arith_Ne_Sgn_Int = 649 + Ieee_Std_Logic_Arith_Ne_Int_Sgn = 650 + Ieee_Std_Logic_Misc_And_Reduce_Slv = 651 + Ieee_Std_Logic_Misc_And_Reduce_Suv = 652 + Ieee_Std_Logic_Misc_Nand_Reduce_Slv = 653 + Ieee_Std_Logic_Misc_Nand_Reduce_Suv = 654 + Ieee_Std_Logic_Misc_Or_Reduce_Slv = 655 + Ieee_Std_Logic_Misc_Or_Reduce_Suv = 656 + Ieee_Std_Logic_Misc_Nor_Reduce_Slv = 657 + Ieee_Std_Logic_Misc_Nor_Reduce_Suv = 658 + Ieee_Std_Logic_Misc_Xor_Reduce_Slv = 659 + Ieee_Std_Logic_Misc_Xor_Reduce_Suv = 660 + Ieee_Std_Logic_Misc_Xnor_Reduce_Slv = 661 + Ieee_Std_Logic_Misc_Xnor_Reduce_Suv = 662 @export diff --git a/src/vhdl/vhdl-ieee-numeric.adb b/src/vhdl/vhdl-ieee-numeric.adb index cfb617166..2e26eb187 100644 --- a/src/vhdl/vhdl-ieee-numeric.adb +++ b/src/vhdl/vhdl-ieee-numeric.adb @@ -542,11 +542,11 @@ package body Vhdl.Ieee.Numeric is (Type_Signed => Iir_Predefined_Ieee_Numeric_Std_Shf_Right_Sgn_Nat, Type_Unsigned => Iir_Predefined_Ieee_Numeric_Std_Shf_Right_Uns_Nat); - Rol_Patterns : constant Shift_Pattern_Type := + Rotate_Left_Patterns : constant Shift_Pattern_Type := (Type_Signed => Iir_Predefined_Ieee_Numeric_Std_Rot_Left_Sgn_Nat, Type_Unsigned => Iir_Predefined_Ieee_Numeric_Std_Rot_Left_Uns_Nat); - Ror_Patterns : constant Shift_Pattern_Type := + Rotate_Right_Patterns : constant Shift_Pattern_Type := (Type_Signed => Iir_Predefined_Ieee_Numeric_Std_Rot_Right_Sgn_Nat, Type_Unsigned => Iir_Predefined_Ieee_Numeric_Std_Rot_Right_Uns_Nat); @@ -566,6 +566,14 @@ package body Vhdl.Ieee.Numeric is (Type_Signed => Iir_Predefined_Ieee_Numeric_Std_Sra_Sgn_Int, Type_Unsigned => Iir_Predefined_Ieee_Numeric_Std_Sra_Uns_Int); + Rol_Patterns : constant Shift_Pattern_Type := + (Type_Signed => Iir_Predefined_Ieee_Numeric_Std_Rol_Sgn_Int, + Type_Unsigned => Iir_Predefined_Ieee_Numeric_Std_Rol_Uns_Int); + + Ror_Patterns : constant Shift_Pattern_Type := + (Type_Signed => Iir_Predefined_Ieee_Numeric_Std_Ror_Sgn_Int, + Type_Unsigned => Iir_Predefined_Ieee_Numeric_Std_Ror_Uns_Int); + Leftmost_Patterns : constant Shift_Pattern_Type := (Type_Signed => Iir_Predefined_Ieee_Numeric_Std_Find_Leftmost_Sgn, Type_Unsigned => Iir_Predefined_Ieee_Numeric_Std_Find_Leftmost_Uns); @@ -971,10 +979,14 @@ package body Vhdl.Ieee.Numeric is Handle_Shift (Sla_Patterns, Type_Signed); when Name_Sra => Handle_Shift (Sra_Patterns, Type_Signed); + when Name_Rol => + Handle_Shift (Rol_Patterns, Type_Signed); + when Name_Ror => + Handle_Shift (Ror_Patterns, Type_Signed); when Name_Rotate_Left => - Handle_Shift (Rol_Patterns, Type_Unsigned); + Handle_Shift (Rotate_Left_Patterns, Type_Unsigned); when Name_Rotate_Right => - Handle_Shift (Ror_Patterns, Type_Unsigned); + Handle_Shift (Rotate_Right_Patterns, Type_Unsigned); when Name_Find_Leftmost => Handle_Find (Leftmost_Patterns); when Name_Find_Rightmost => diff --git a/src/vhdl/vhdl-nodes.ads b/src/vhdl/vhdl-nodes.ads index 1295c59c1..a36566a5c 100644 --- a/src/vhdl/vhdl-nodes.ads +++ b/src/vhdl/vhdl-nodes.ads @@ -5824,6 +5824,10 @@ package Vhdl.Nodes is Iir_Predefined_Ieee_Numeric_Std_Sla_Sgn_Int, Iir_Predefined_Ieee_Numeric_Std_Sra_Uns_Int, Iir_Predefined_Ieee_Numeric_Std_Sra_Sgn_Int, + Iir_Predefined_Ieee_Numeric_Std_Rol_Uns_Int, + Iir_Predefined_Ieee_Numeric_Std_Rol_Sgn_Int, + Iir_Predefined_Ieee_Numeric_Std_Ror_Uns_Int, + Iir_Predefined_Ieee_Numeric_Std_Ror_Sgn_Int, Iir_Predefined_Ieee_Numeric_Std_And_Uns_Uns, Iir_Predefined_Ieee_Numeric_Std_And_Sgn_Sgn, |