diff options
| -rw-r--r-- | python/libghdl/thin/vhdl/nodes.py | 340 | ||||
| -rw-r--r-- | src/vhdl/vhdl-ieee-numeric.adb | 40 | ||||
| -rw-r--r-- | src/vhdl/vhdl-nodes.ads | 14 |
3 files changed, 230 insertions, 164 deletions
diff --git a/python/libghdl/thin/vhdl/nodes.py b/python/libghdl/thin/vhdl/nodes.py index 1485d5ec2..2c2c00386 100644 --- a/python/libghdl/thin/vhdl/nodes.py +++ b/python/libghdl/thin/vhdl/nodes.py @@ -1279,170 +1279,182 @@ class Iir_Predefined: Ieee_Numeric_Std_Ne_Sgn_Sgn = 296 Ieee_Numeric_Std_Ne_Sgn_Int = 297 Ieee_Numeric_Std_Ne_Int_Sgn = 298 - Ieee_Numeric_Std_Match_Gt_Uns_Uns = 299 - Ieee_Numeric_Std_Match_Gt_Uns_Nat = 300 - Ieee_Numeric_Std_Match_Gt_Nat_Uns = 301 - Ieee_Numeric_Std_Match_Gt_Sgn_Sgn = 302 - Ieee_Numeric_Std_Match_Gt_Sgn_Int = 303 - Ieee_Numeric_Std_Match_Gt_Int_Sgn = 304 - Ieee_Numeric_Std_Match_Lt_Uns_Uns = 305 - Ieee_Numeric_Std_Match_Lt_Uns_Nat = 306 - Ieee_Numeric_Std_Match_Lt_Nat_Uns = 307 - Ieee_Numeric_Std_Match_Lt_Sgn_Sgn = 308 - Ieee_Numeric_Std_Match_Lt_Sgn_Int = 309 - Ieee_Numeric_Std_Match_Lt_Int_Sgn = 310 - Ieee_Numeric_Std_Match_Le_Uns_Uns = 311 - Ieee_Numeric_Std_Match_Le_Uns_Nat = 312 - Ieee_Numeric_Std_Match_Le_Nat_Uns = 313 - Ieee_Numeric_Std_Match_Le_Sgn_Sgn = 314 - Ieee_Numeric_Std_Match_Le_Sgn_Int = 315 - Ieee_Numeric_Std_Match_Le_Int_Sgn = 316 - Ieee_Numeric_Std_Match_Ge_Uns_Uns = 317 - Ieee_Numeric_Std_Match_Ge_Uns_Nat = 318 - Ieee_Numeric_Std_Match_Ge_Nat_Uns = 319 - Ieee_Numeric_Std_Match_Ge_Sgn_Sgn = 320 - Ieee_Numeric_Std_Match_Ge_Sgn_Int = 321 - Ieee_Numeric_Std_Match_Ge_Int_Sgn = 322 - Ieee_Numeric_Std_Match_Eq_Uns_Uns = 323 - Ieee_Numeric_Std_Match_Eq_Uns_Nat = 324 - Ieee_Numeric_Std_Match_Eq_Nat_Uns = 325 - Ieee_Numeric_Std_Match_Eq_Sgn_Sgn = 326 - Ieee_Numeric_Std_Match_Eq_Sgn_Int = 327 - Ieee_Numeric_Std_Match_Eq_Int_Sgn = 328 - Ieee_Numeric_Std_Match_Ne_Uns_Uns = 329 - Ieee_Numeric_Std_Match_Ne_Uns_Nat = 330 - Ieee_Numeric_Std_Match_Ne_Nat_Uns = 331 - Ieee_Numeric_Std_Match_Ne_Sgn_Sgn = 332 - Ieee_Numeric_Std_Match_Ne_Sgn_Int = 333 - Ieee_Numeric_Std_Match_Ne_Int_Sgn = 334 - Ieee_Numeric_Std_Shl_Uns_Nat = 335 - Ieee_Numeric_Std_Shr_Uns_Nat = 336 - Ieee_Numeric_Std_Shl_Sgn_Nat = 337 - Ieee_Numeric_Std_Shr_Sgn_Nat = 338 - Ieee_Numeric_Std_Sll_Uns_Int = 339 - Ieee_Numeric_Std_Sll_Sgn_Int = 340 - Ieee_Numeric_Std_Srl_Uns_Int = 341 - Ieee_Numeric_Std_Srl_Sgn_Int = 342 - Ieee_Numeric_Std_Sla_Uns_Int = 343 - Ieee_Numeric_Std_Sla_Sgn_Int = 344 - Ieee_Numeric_Std_Sra_Uns_Int = 345 - Ieee_Numeric_Std_Sra_Sgn_Int = 346 - Ieee_Numeric_Std_Rol_Uns_Nat = 347 - Ieee_Numeric_Std_Ror_Uns_Nat = 348 - Ieee_Numeric_Std_Rol_Sgn_Nat = 349 - Ieee_Numeric_Std_Ror_Sgn_Nat = 350 - Ieee_Numeric_Std_Not_Uns = 351 - Ieee_Numeric_Std_Not_Sgn = 352 - Ieee_Numeric_Std_Abs_Sgn = 353 - Ieee_Numeric_Std_And_Uns_Uns = 354 - Ieee_Numeric_Std_And_Sgn_Sgn = 355 - Ieee_Numeric_Std_Or_Uns_Uns = 356 - Ieee_Numeric_Std_Or_Sgn_Sgn = 357 - Ieee_Numeric_Std_Nand_Uns_Uns = 358 - Ieee_Numeric_Std_Nand_Sgn_Sgn = 359 - Ieee_Numeric_Std_Nor_Uns_Uns = 360 - Ieee_Numeric_Std_Nor_Sgn_Sgn = 361 - Ieee_Numeric_Std_Xor_Uns_Uns = 362 - Ieee_Numeric_Std_Xor_Sgn_Sgn = 363 - Ieee_Numeric_Std_Xnor_Uns_Uns = 364 - Ieee_Numeric_Std_Xnor_Sgn_Sgn = 365 - Ieee_Numeric_Std_Neg_Uns = 366 - Ieee_Numeric_Std_Neg_Sgn = 367 - Ieee_Numeric_Std_Match_Log = 368 - Ieee_Numeric_Std_Match_Uns = 369 - Ieee_Numeric_Std_Match_Sgn = 370 - Ieee_Numeric_Std_Match_Slv = 371 - Ieee_Numeric_Std_Match_Suv = 372 - Ieee_Math_Real_Ceil = 373 - Ieee_Math_Real_Round = 374 - Ieee_Math_Real_Log2 = 375 - Ieee_Math_Real_Sin = 376 - Ieee_Math_Real_Cos = 377 - Ieee_Std_Logic_Unsigned_Add_Slv_Slv = 378 - Ieee_Std_Logic_Unsigned_Add_Slv_Int = 379 - Ieee_Std_Logic_Unsigned_Add_Int_Slv = 380 - Ieee_Std_Logic_Unsigned_Add_Slv_Log = 381 - Ieee_Std_Logic_Unsigned_Add_Log_Slv = 382 - Ieee_Std_Logic_Unsigned_Sub_Slv_Slv = 383 - Ieee_Std_Logic_Unsigned_Sub_Slv_Int = 384 - Ieee_Std_Logic_Unsigned_Sub_Int_Slv = 385 - Ieee_Std_Logic_Unsigned_Sub_Slv_Log = 386 - Ieee_Std_Logic_Unsigned_Sub_Log_Slv = 387 - Ieee_Std_Logic_Unsigned_Mul_Slv_Slv = 388 - Ieee_Std_Logic_Unsigned_Lt_Slv_Slv = 389 - Ieee_Std_Logic_Unsigned_Lt_Slv_Int = 390 - Ieee_Std_Logic_Unsigned_Lt_Int_Slv = 391 - Ieee_Std_Logic_Unsigned_Le_Slv_Slv = 392 - Ieee_Std_Logic_Unsigned_Le_Slv_Int = 393 - Ieee_Std_Logic_Unsigned_Le_Int_Slv = 394 - Ieee_Std_Logic_Unsigned_Gt_Slv_Slv = 395 - Ieee_Std_Logic_Unsigned_Gt_Slv_Int = 396 - Ieee_Std_Logic_Unsigned_Gt_Int_Slv = 397 - Ieee_Std_Logic_Unsigned_Ge_Slv_Slv = 398 - Ieee_Std_Logic_Unsigned_Ge_Slv_Int = 399 - Ieee_Std_Logic_Unsigned_Ge_Int_Slv = 400 - Ieee_Std_Logic_Unsigned_Eq_Slv_Slv = 401 - Ieee_Std_Logic_Unsigned_Eq_Slv_Int = 402 - Ieee_Std_Logic_Unsigned_Eq_Int_Slv = 403 - Ieee_Std_Logic_Unsigned_Ne_Slv_Slv = 404 - Ieee_Std_Logic_Unsigned_Ne_Slv_Int = 405 - Ieee_Std_Logic_Unsigned_Ne_Int_Slv = 406 - Ieee_Std_Logic_Unsigned_Conv_Integer = 407 - Ieee_Std_Logic_Signed_Add_Slv_Slv = 408 - Ieee_Std_Logic_Signed_Add_Slv_Int = 409 - Ieee_Std_Logic_Signed_Add_Int_Slv = 410 - Ieee_Std_Logic_Signed_Add_Slv_Log = 411 - Ieee_Std_Logic_Signed_Add_Log_Slv = 412 - Ieee_Std_Logic_Signed_Sub_Slv_Slv = 413 - Ieee_Std_Logic_Signed_Sub_Slv_Int = 414 - Ieee_Std_Logic_Signed_Sub_Int_Slv = 415 - Ieee_Std_Logic_Signed_Sub_Slv_Log = 416 - Ieee_Std_Logic_Signed_Sub_Log_Slv = 417 - Ieee_Std_Logic_Signed_Mul_Slv_Slv = 418 - Ieee_Std_Logic_Arith_Conv_Unsigned_Int = 419 - Ieee_Std_Logic_Arith_Conv_Unsigned_Uns = 420 - Ieee_Std_Logic_Arith_Conv_Unsigned_Sgn = 421 - Ieee_Std_Logic_Arith_Conv_Unsigned_Log = 422 - Ieee_Std_Logic_Arith_Conv_Integer_Int = 423 - Ieee_Std_Logic_Arith_Conv_Integer_Uns = 424 - Ieee_Std_Logic_Arith_Conv_Integer_Sgn = 425 - Ieee_Std_Logic_Arith_Conv_Integer_Log = 426 - Ieee_Std_Logic_Arith_Conv_Vector_Int = 427 - Ieee_Std_Logic_Arith_Conv_Vector_Uns = 428 - Ieee_Std_Logic_Arith_Conv_Vector_Sgn = 429 - Ieee_Std_Logic_Arith_Conv_Vector_Log = 430 - Ieee_Std_Logic_Arith_Mul_Uns_Uns_Uns = 431 - Ieee_Std_Logic_Arith_Mul_Sgn_Sgn_Sgn = 432 - Ieee_Std_Logic_Arith_Mul_Sgn_Uns_Sgn = 433 - Ieee_Std_Logic_Arith_Mul_Uns_Sgn_Sgn = 434 - Ieee_Std_Logic_Arith_Mul_Uns_Uns_Slv = 435 - Ieee_Std_Logic_Arith_Mul_Sgn_Sgn_Slv = 436 - Ieee_Std_Logic_Arith_Mul_Sgn_Uns_Slv = 437 - Ieee_Std_Logic_Arith_Mul_Uns_Sgn_Slv = 438 - Ieee_Std_Logic_Arith_Add_Uns_Uns_Uns = 439 - Ieee_Std_Logic_Arith_Add_Sgn_Sgn_Sgn = 440 - Ieee_Std_Logic_Arith_Add_Uns_Sgn_Sgn = 441 - Ieee_Std_Logic_Arith_Add_Sgn_Uns_Sgn = 442 - Ieee_Std_Logic_Arith_Add_Uns_Int_Uns = 443 - Ieee_Std_Logic_Arith_Add_Int_Uns_Uns = 444 - Ieee_Std_Logic_Arith_Add_Sgn_Int_Sgn = 445 - Ieee_Std_Logic_Arith_Add_Int_Sgn_Sgn = 446 - Ieee_Std_Logic_Arith_Add_Uns_Log_Uns = 447 - Ieee_Std_Logic_Arith_Add_Log_Uns_Uns = 448 - Ieee_Std_Logic_Arith_Add_Sgn_Log_Sgn = 449 - Ieee_Std_Logic_Arith_Add_Log_Sgn_Sgn = 450 - Ieee_Std_Logic_Arith_Add_Uns_Uns_Slv = 451 - Ieee_Std_Logic_Arith_Add_Sgn_Sgn_Slv = 452 - Ieee_Std_Logic_Arith_Add_Uns_Sgn_Slv = 453 - Ieee_Std_Logic_Arith_Add_Sgn_Uns_Slv = 454 - Ieee_Std_Logic_Arith_Add_Uns_Int_Slv = 455 - Ieee_Std_Logic_Arith_Add_Int_Uns_Slv = 456 - Ieee_Std_Logic_Arith_Add_Sgn_Int_Slv = 457 - Ieee_Std_Logic_Arith_Add_Int_Sgn_Slv = 458 - Ieee_Std_Logic_Arith_Add_Uns_Log_Slv = 459 - Ieee_Std_Logic_Arith_Add_Log_Uns_Slv = 460 - Ieee_Std_Logic_Arith_Add_Sgn_Log_Slv = 461 - Ieee_Std_Logic_Arith_Add_Log_Sgn_Slv = 462 + Ieee_Numeric_Std_Min_Uns_Uns = 299 + Ieee_Numeric_Std_Min_Uns_Nat = 300 + Ieee_Numeric_Std_Min_Nat_Uns = 301 + Ieee_Numeric_Std_Min_Sgn_Sgn = 302 + Ieee_Numeric_Std_Min_Sgn_Int = 303 + Ieee_Numeric_Std_Min_Int_Sgn = 304 + Ieee_Numeric_Std_Max_Uns_Uns = 305 + Ieee_Numeric_Std_Max_Uns_Nat = 306 + Ieee_Numeric_Std_Max_Nat_Uns = 307 + Ieee_Numeric_Std_Max_Sgn_Sgn = 308 + Ieee_Numeric_Std_Max_Sgn_Int = 309 + Ieee_Numeric_Std_Max_Int_Sgn = 310 + Ieee_Numeric_Std_Match_Gt_Uns_Uns = 311 + Ieee_Numeric_Std_Match_Gt_Uns_Nat = 312 + Ieee_Numeric_Std_Match_Gt_Nat_Uns = 313 + Ieee_Numeric_Std_Match_Gt_Sgn_Sgn = 314 + Ieee_Numeric_Std_Match_Gt_Sgn_Int = 315 + Ieee_Numeric_Std_Match_Gt_Int_Sgn = 316 + Ieee_Numeric_Std_Match_Lt_Uns_Uns = 317 + Ieee_Numeric_Std_Match_Lt_Uns_Nat = 318 + Ieee_Numeric_Std_Match_Lt_Nat_Uns = 319 + Ieee_Numeric_Std_Match_Lt_Sgn_Sgn = 320 + Ieee_Numeric_Std_Match_Lt_Sgn_Int = 321 + Ieee_Numeric_Std_Match_Lt_Int_Sgn = 322 + Ieee_Numeric_Std_Match_Le_Uns_Uns = 323 + Ieee_Numeric_Std_Match_Le_Uns_Nat = 324 + Ieee_Numeric_Std_Match_Le_Nat_Uns = 325 + Ieee_Numeric_Std_Match_Le_Sgn_Sgn = 326 + Ieee_Numeric_Std_Match_Le_Sgn_Int = 327 + Ieee_Numeric_Std_Match_Le_Int_Sgn = 328 + Ieee_Numeric_Std_Match_Ge_Uns_Uns = 329 + Ieee_Numeric_Std_Match_Ge_Uns_Nat = 330 + Ieee_Numeric_Std_Match_Ge_Nat_Uns = 331 + Ieee_Numeric_Std_Match_Ge_Sgn_Sgn = 332 + Ieee_Numeric_Std_Match_Ge_Sgn_Int = 333 + Ieee_Numeric_Std_Match_Ge_Int_Sgn = 334 + Ieee_Numeric_Std_Match_Eq_Uns_Uns = 335 + Ieee_Numeric_Std_Match_Eq_Uns_Nat = 336 + Ieee_Numeric_Std_Match_Eq_Nat_Uns = 337 + Ieee_Numeric_Std_Match_Eq_Sgn_Sgn = 338 + Ieee_Numeric_Std_Match_Eq_Sgn_Int = 339 + Ieee_Numeric_Std_Match_Eq_Int_Sgn = 340 + Ieee_Numeric_Std_Match_Ne_Uns_Uns = 341 + Ieee_Numeric_Std_Match_Ne_Uns_Nat = 342 + Ieee_Numeric_Std_Match_Ne_Nat_Uns = 343 + Ieee_Numeric_Std_Match_Ne_Sgn_Sgn = 344 + Ieee_Numeric_Std_Match_Ne_Sgn_Int = 345 + Ieee_Numeric_Std_Match_Ne_Int_Sgn = 346 + Ieee_Numeric_Std_Shl_Uns_Nat = 347 + Ieee_Numeric_Std_Shr_Uns_Nat = 348 + Ieee_Numeric_Std_Shl_Sgn_Nat = 349 + Ieee_Numeric_Std_Shr_Sgn_Nat = 350 + Ieee_Numeric_Std_Sll_Uns_Int = 351 + Ieee_Numeric_Std_Sll_Sgn_Int = 352 + Ieee_Numeric_Std_Srl_Uns_Int = 353 + Ieee_Numeric_Std_Srl_Sgn_Int = 354 + Ieee_Numeric_Std_Sla_Uns_Int = 355 + Ieee_Numeric_Std_Sla_Sgn_Int = 356 + Ieee_Numeric_Std_Sra_Uns_Int = 357 + Ieee_Numeric_Std_Sra_Sgn_Int = 358 + Ieee_Numeric_Std_Rol_Uns_Nat = 359 + Ieee_Numeric_Std_Ror_Uns_Nat = 360 + Ieee_Numeric_Std_Rol_Sgn_Nat = 361 + Ieee_Numeric_Std_Ror_Sgn_Nat = 362 + Ieee_Numeric_Std_Not_Uns = 363 + Ieee_Numeric_Std_Not_Sgn = 364 + Ieee_Numeric_Std_Abs_Sgn = 365 + Ieee_Numeric_Std_And_Uns_Uns = 366 + Ieee_Numeric_Std_And_Sgn_Sgn = 367 + Ieee_Numeric_Std_Or_Uns_Uns = 368 + Ieee_Numeric_Std_Or_Sgn_Sgn = 369 + Ieee_Numeric_Std_Nand_Uns_Uns = 370 + Ieee_Numeric_Std_Nand_Sgn_Sgn = 371 + Ieee_Numeric_Std_Nor_Uns_Uns = 372 + Ieee_Numeric_Std_Nor_Sgn_Sgn = 373 + Ieee_Numeric_Std_Xor_Uns_Uns = 374 + Ieee_Numeric_Std_Xor_Sgn_Sgn = 375 + Ieee_Numeric_Std_Xnor_Uns_Uns = 376 + Ieee_Numeric_Std_Xnor_Sgn_Sgn = 377 + Ieee_Numeric_Std_Neg_Uns = 378 + Ieee_Numeric_Std_Neg_Sgn = 379 + Ieee_Numeric_Std_Match_Log = 380 + Ieee_Numeric_Std_Match_Uns = 381 + Ieee_Numeric_Std_Match_Sgn = 382 + Ieee_Numeric_Std_Match_Slv = 383 + Ieee_Numeric_Std_Match_Suv = 384 + Ieee_Math_Real_Ceil = 385 + Ieee_Math_Real_Round = 386 + Ieee_Math_Real_Log2 = 387 + Ieee_Math_Real_Sin = 388 + Ieee_Math_Real_Cos = 389 + Ieee_Std_Logic_Unsigned_Add_Slv_Slv = 390 + Ieee_Std_Logic_Unsigned_Add_Slv_Int = 391 + Ieee_Std_Logic_Unsigned_Add_Int_Slv = 392 + Ieee_Std_Logic_Unsigned_Add_Slv_Log = 393 + Ieee_Std_Logic_Unsigned_Add_Log_Slv = 394 + Ieee_Std_Logic_Unsigned_Sub_Slv_Slv = 395 + Ieee_Std_Logic_Unsigned_Sub_Slv_Int = 396 + Ieee_Std_Logic_Unsigned_Sub_Int_Slv = 397 + Ieee_Std_Logic_Unsigned_Sub_Slv_Log = 398 + Ieee_Std_Logic_Unsigned_Sub_Log_Slv = 399 + Ieee_Std_Logic_Unsigned_Mul_Slv_Slv = 400 + Ieee_Std_Logic_Unsigned_Lt_Slv_Slv = 401 + Ieee_Std_Logic_Unsigned_Lt_Slv_Int = 402 + Ieee_Std_Logic_Unsigned_Lt_Int_Slv = 403 + Ieee_Std_Logic_Unsigned_Le_Slv_Slv = 404 + Ieee_Std_Logic_Unsigned_Le_Slv_Int = 405 + Ieee_Std_Logic_Unsigned_Le_Int_Slv = 406 + Ieee_Std_Logic_Unsigned_Gt_Slv_Slv = 407 + Ieee_Std_Logic_Unsigned_Gt_Slv_Int = 408 + Ieee_Std_Logic_Unsigned_Gt_Int_Slv = 409 + Ieee_Std_Logic_Unsigned_Ge_Slv_Slv = 410 + Ieee_Std_Logic_Unsigned_Ge_Slv_Int = 411 + Ieee_Std_Logic_Unsigned_Ge_Int_Slv = 412 + Ieee_Std_Logic_Unsigned_Eq_Slv_Slv = 413 + Ieee_Std_Logic_Unsigned_Eq_Slv_Int = 414 + Ieee_Std_Logic_Unsigned_Eq_Int_Slv = 415 + Ieee_Std_Logic_Unsigned_Ne_Slv_Slv = 416 + Ieee_Std_Logic_Unsigned_Ne_Slv_Int = 417 + Ieee_Std_Logic_Unsigned_Ne_Int_Slv = 418 + Ieee_Std_Logic_Unsigned_Conv_Integer = 419 + Ieee_Std_Logic_Signed_Add_Slv_Slv = 420 + Ieee_Std_Logic_Signed_Add_Slv_Int = 421 + Ieee_Std_Logic_Signed_Add_Int_Slv = 422 + Ieee_Std_Logic_Signed_Add_Slv_Log = 423 + Ieee_Std_Logic_Signed_Add_Log_Slv = 424 + Ieee_Std_Logic_Signed_Sub_Slv_Slv = 425 + Ieee_Std_Logic_Signed_Sub_Slv_Int = 426 + Ieee_Std_Logic_Signed_Sub_Int_Slv = 427 + Ieee_Std_Logic_Signed_Sub_Slv_Log = 428 + Ieee_Std_Logic_Signed_Sub_Log_Slv = 429 + Ieee_Std_Logic_Signed_Mul_Slv_Slv = 430 + Ieee_Std_Logic_Arith_Conv_Unsigned_Int = 431 + Ieee_Std_Logic_Arith_Conv_Unsigned_Uns = 432 + Ieee_Std_Logic_Arith_Conv_Unsigned_Sgn = 433 + Ieee_Std_Logic_Arith_Conv_Unsigned_Log = 434 + Ieee_Std_Logic_Arith_Conv_Integer_Int = 435 + Ieee_Std_Logic_Arith_Conv_Integer_Uns = 436 + Ieee_Std_Logic_Arith_Conv_Integer_Sgn = 437 + Ieee_Std_Logic_Arith_Conv_Integer_Log = 438 + Ieee_Std_Logic_Arith_Conv_Vector_Int = 439 + Ieee_Std_Logic_Arith_Conv_Vector_Uns = 440 + Ieee_Std_Logic_Arith_Conv_Vector_Sgn = 441 + Ieee_Std_Logic_Arith_Conv_Vector_Log = 442 + Ieee_Std_Logic_Arith_Mul_Uns_Uns_Uns = 443 + Ieee_Std_Logic_Arith_Mul_Sgn_Sgn_Sgn = 444 + Ieee_Std_Logic_Arith_Mul_Sgn_Uns_Sgn = 445 + Ieee_Std_Logic_Arith_Mul_Uns_Sgn_Sgn = 446 + Ieee_Std_Logic_Arith_Mul_Uns_Uns_Slv = 447 + Ieee_Std_Logic_Arith_Mul_Sgn_Sgn_Slv = 448 + Ieee_Std_Logic_Arith_Mul_Sgn_Uns_Slv = 449 + Ieee_Std_Logic_Arith_Mul_Uns_Sgn_Slv = 450 + Ieee_Std_Logic_Arith_Add_Uns_Uns_Uns = 451 + Ieee_Std_Logic_Arith_Add_Sgn_Sgn_Sgn = 452 + Ieee_Std_Logic_Arith_Add_Uns_Sgn_Sgn = 453 + Ieee_Std_Logic_Arith_Add_Sgn_Uns_Sgn = 454 + Ieee_Std_Logic_Arith_Add_Uns_Int_Uns = 455 + Ieee_Std_Logic_Arith_Add_Int_Uns_Uns = 456 + Ieee_Std_Logic_Arith_Add_Sgn_Int_Sgn = 457 + Ieee_Std_Logic_Arith_Add_Int_Sgn_Sgn = 458 + Ieee_Std_Logic_Arith_Add_Uns_Log_Uns = 459 + Ieee_Std_Logic_Arith_Add_Log_Uns_Uns = 460 + Ieee_Std_Logic_Arith_Add_Sgn_Log_Sgn = 461 + Ieee_Std_Logic_Arith_Add_Log_Sgn_Sgn = 462 + Ieee_Std_Logic_Arith_Add_Uns_Uns_Slv = 463 + Ieee_Std_Logic_Arith_Add_Sgn_Sgn_Slv = 464 + Ieee_Std_Logic_Arith_Add_Uns_Sgn_Slv = 465 + Ieee_Std_Logic_Arith_Add_Sgn_Uns_Slv = 466 + Ieee_Std_Logic_Arith_Add_Uns_Int_Slv = 467 + Ieee_Std_Logic_Arith_Add_Int_Uns_Slv = 468 + Ieee_Std_Logic_Arith_Add_Sgn_Int_Slv = 469 + Ieee_Std_Logic_Arith_Add_Int_Sgn_Slv = 470 + Ieee_Std_Logic_Arith_Add_Uns_Log_Slv = 471 + Ieee_Std_Logic_Arith_Add_Log_Uns_Slv = 472 + Ieee_Std_Logic_Arith_Add_Sgn_Log_Slv = 473 + Ieee_Std_Logic_Arith_Add_Log_Sgn_Slv = 474 Get_Kind = libghdl.vhdl__nodes__get_kind Get_Location = libghdl.vhdl__nodes__get_location diff --git a/src/vhdl/vhdl-ieee-numeric.adb b/src/vhdl/vhdl-ieee-numeric.adb index f03ac61d4..8f94b8fde 100644 --- a/src/vhdl/vhdl-ieee-numeric.adb +++ b/src/vhdl/vhdl-ieee-numeric.adb @@ -256,6 +256,42 @@ package body Vhdl.Ieee.Numeric is (others => (others => Iir_Predefined_None))); + Min_Patterns : constant Binary_Pattern_Type := + (Pkg_Std => + (Type_Unsigned => + (Arg_Vect_Vect => Iir_Predefined_Ieee_Numeric_Std_Min_Uns_Uns, + Arg_Vect_Scal => Iir_Predefined_Ieee_Numeric_Std_Min_Uns_Nat, + Arg_Scal_Vect => Iir_Predefined_Ieee_Numeric_Std_Min_Nat_Uns, + Arg_Vect_Log => Iir_Predefined_None, + Arg_Log_Vect => Iir_Predefined_None), + Type_Signed => + (Arg_Vect_Vect => Iir_Predefined_Ieee_Numeric_Std_Min_Sgn_Sgn, + Arg_Vect_Scal => Iir_Predefined_Ieee_Numeric_Std_Min_Sgn_Int, + Arg_Scal_Vect => Iir_Predefined_Ieee_Numeric_Std_Min_Int_Sgn, + Arg_Vect_Log => Iir_Predefined_None, + Arg_Log_Vect => Iir_Predefined_None)), + Pkg_Bit => + (others => + (others => Iir_Predefined_None))); + + Max_Patterns : constant Binary_Pattern_Type := + (Pkg_Std => + (Type_Unsigned => + (Arg_Vect_Vect => Iir_Predefined_Ieee_Numeric_Std_Max_Uns_Uns, + Arg_Vect_Scal => Iir_Predefined_Ieee_Numeric_Std_Max_Uns_Nat, + Arg_Scal_Vect => Iir_Predefined_Ieee_Numeric_Std_Max_Nat_Uns, + Arg_Vect_Log => Iir_Predefined_None, + Arg_Log_Vect => Iir_Predefined_None), + Type_Signed => + (Arg_Vect_Vect => Iir_Predefined_Ieee_Numeric_Std_Max_Sgn_Sgn, + Arg_Vect_Scal => Iir_Predefined_Ieee_Numeric_Std_Max_Sgn_Int, + Arg_Scal_Vect => Iir_Predefined_Ieee_Numeric_Std_Max_Int_Sgn, + Arg_Vect_Log => Iir_Predefined_None, + Arg_Log_Vect => Iir_Predefined_None)), + Pkg_Bit => + (others => + (others => Iir_Predefined_None))); + Match_Eq_Patterns : constant Binary_Pattern_Type := (Pkg_Std => (Type_Unsigned => @@ -793,6 +829,10 @@ package body Vhdl.Ieee.Numeric is Handle_Binary (Gt_Patterns); when Name_Op_Greater_Equal => Handle_Binary (Ge_Patterns); + when Name_Minimum => + Handle_Binary (Min_Patterns); + when Name_Maximum => + Handle_Binary (Max_Patterns); when Name_Op_Match_Equality => Handle_Binary (Match_Eq_Patterns); when Name_Op_Match_Inequality => diff --git a/src/vhdl/vhdl-nodes.ads b/src/vhdl/vhdl-nodes.ads index 8be86f9dd..7c2bebd42 100644 --- a/src/vhdl/vhdl-nodes.ads +++ b/src/vhdl/vhdl-nodes.ads @@ -5583,6 +5583,20 @@ package Vhdl.Nodes is Iir_Predefined_Ieee_Numeric_Std_Ne_Sgn_Int, Iir_Predefined_Ieee_Numeric_Std_Ne_Int_Sgn, + Iir_Predefined_Ieee_Numeric_Std_Min_Uns_Uns, + Iir_Predefined_Ieee_Numeric_Std_Min_Uns_Nat, + Iir_Predefined_Ieee_Numeric_Std_Min_Nat_Uns, + Iir_Predefined_Ieee_Numeric_Std_Min_Sgn_Sgn, + Iir_Predefined_Ieee_Numeric_Std_Min_Sgn_Int, + Iir_Predefined_Ieee_Numeric_Std_Min_Int_Sgn, + + Iir_Predefined_Ieee_Numeric_Std_Max_Uns_Uns, + Iir_Predefined_Ieee_Numeric_Std_Max_Uns_Nat, + Iir_Predefined_Ieee_Numeric_Std_Max_Nat_Uns, + Iir_Predefined_Ieee_Numeric_Std_Max_Sgn_Sgn, + Iir_Predefined_Ieee_Numeric_Std_Max_Sgn_Int, + Iir_Predefined_Ieee_Numeric_Std_Max_Int_Sgn, + Iir_Predefined_Ieee_Numeric_Std_Match_Gt_Uns_Uns, Iir_Predefined_Ieee_Numeric_Std_Match_Gt_Uns_Nat, Iir_Predefined_Ieee_Numeric_Std_Match_Gt_Nat_Uns, |