Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | .half and .byte supported |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
4f12102c369a782058056940325ab49c |
| User & Date: | kc5tja 2019-09-03 04:31:54.061 |
Context
|
2019-09-03
| ||
| 04:41 | .8byte, .4byte, and .2byte implemented check-in: 8a46823df5 user: kc5tja tags: trunk | |
| 04:31 | .half and .byte supported check-in: 4f12102c36 user: kc5tja tags: trunk | |
| 04:23 | Support .word check-in: c0b13ae1bb user: kc5tja tags: trunk | |
Changes
Changes to dev/src/bcpl/assemrv/manifest.h.
| ︙ | ︙ | |||
102 103 104 105 106 107 108 109 110 |
scs_string;
scs_endstreamch = endstreamch;
// Intermediate Representation order codes
IR_LIT = 1000;
IR_DWORD;
IR_WORD;
}
| > > | 102 103 104 105 106 107 108 109 110 111 112 |
scs_string;
scs_endstreamch = endstreamch;
// Intermediate Representation order codes
IR_LIT = 1000;
IR_DWORD;
IR_WORD;
IR_HALF;
IR_BYTE;
}
|
Changes to dev/src/bcpl/assemrv/parser.b.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 |
LET parse(s, d, errp) BE {
LET sym = scanner_sym(s)
// Don't even try unless a chain of errors can be constructed.
UNLESS errp DO RETURN
IF sym = scs_dword DO scanner_next(s) <> const(s, d, errp, IR_DWORD) <> RETURN
IF sym = scs_word DO scanner_next(s) <> const(s, d, errp, IR_WORD) <> RETURN
error(errp, s, err_syntax_error)
}
AND error(errp, scanner, errcode) BE {
LET errdesc = getvec(ed_sizeof)
IF errdesc DO {
| > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 |
LET parse(s, d, errp) BE {
LET sym = scanner_sym(s)
// Don't even try unless a chain of errors can be constructed.
UNLESS errp DO RETURN
IF sym = scs_dword DO scanner_next(s) <> const(s, d, errp, IR_DWORD) <> RETURN
IF sym = scs_word DO scanner_next(s) <> const(s, d, errp, IR_WORD) <> RETURN
IF sym = scs_half DO scanner_next(s) <> const(s, d, errp, IR_HALF) <> RETURN
IF sym = scs_byte DO scanner_next(s) <> const(s, d, errp, IR_BYTE) <> RETURN
error(errp, s, err_syntax_error)
}
AND error(errp, scanner, errcode) BE {
LET errdesc = getvec(ed_sizeof)
IF errdesc DO {
|
| ︙ | ︙ |
Changes to dev/src/bcpl/assemrv/test_parser.b.
| ︙ | ︙ | |||
60 61 62 63 64 65 66 |
GET "globals_dynvec"
GET "globals_scanner"
GET "globals_utils"
GET "globals_parser"
LET testlist() = VALOF {
| | > > > > > > | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 |
GET "globals_dynvec"
GET "globals_scanner"
GET "globals_utils"
GET "globals_parser"
LET testlist() = VALOF {
MANIFEST { ntests = 12 }
LET tl = getvec(ntests)
tl!0 := ntests
tl!1 := test_single_dword
tl!2 := test_single_dword_chain
tl!3 := test_single_dword_string
tl!4 := test_single_word
tl!5 := test_single_word_chain
tl!6 := test_single_word_string
tl!7 := test_single_half
tl!8 := test_single_half_chain
tl!9 := test_single_half_string
tl!10 := test_single_byte
tl!11 := test_single_byte_chain
tl!12 := test_single_byte_string
RESULTIS tl
}
// Parser Tests: Simple listings: 64-bit words
AND test_single_dword(r) = VALOF {
|
| ︙ | ︙ | |||
226 227 228 229 230 231 232 233 234 235 236 237 238 239 |
unwind:
IF errlist DO free_errors(errlist)
IF d DO dynvec_free(d)
IF s DO scanner_free(s)
IF scb DO endstream(scb)
RESULTIS err
}
// Parser Tests: Simple listings: 32-bit words
AND test_single_word(r) = VALOF {
LET err = failat
LET scb, s, d = 0, 0, 0
LET errlist = 0
| > | 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 |
unwind:
IF errlist DO free_errors(errlist)
IF d DO dynvec_free(d)
IF s DO scanner_free(s)
IF scb DO endstream(scb)
RESULTIS err
}
// Parser Tests: Simple listings: 32-bit words
AND test_single_word(r) = VALOF {
LET err = failat
LET scb, s, d = 0, 0, 0
LET errlist = 0
|
| ︙ | ︙ | |||
370 371 372 373 374 375 376 377 | unwind: IF errlist DO free_errors(errlist) IF d DO dynvec_free(d) IF s DO scanner_free(s) IF scb DO endstream(scb) RESULTIS err } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 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 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 |
unwind:
IF errlist DO free_errors(errlist)
IF d DO dynvec_free(d)
IF s DO scanner_free(s)
IF scb DO endstream(scb)
RESULTIS err
}
// Parser Tests: Simple listings: 16-bit words
AND test_single_half(r) = VALOF {
LET err = failat
LET scb, s, d = 0, 0, 0
LET errlist = 0
IF r DO RESULTIS r
testid := "test_single_half"
scb := findinoutput("RAM:")
UNLESS NEQ(scb, 0, 0) DO GOTO unwind
{
LET outs = output()
selectoutput(scb)
writef(".half 1*n")
selectoutput(outs)
rewindstream(scb)
}
s := make_scanner()
UNLESS NEQ(s, 0, 1) DO GOTO unwind
UNLESS EQ(scanner_get_stream(s, scb, "RAM:"), TRUE, 3) DO GOTO unwind
scanner_nextchar(s)
scanner_next(s)
d := make_dynvec()
UNLESS NEQ(d, 0, 4) DO GOTO unwind
parse(s, d, @errlist)
UNLESS EQ(errlist, 0, 5) DO GOTO unwind
UNLESS EQ(d!dv_length, 3, 100) DO GOTO unwind
UNLESS EQ(dynvec_at(d, 0), IR_LIT, 101) DO GOTO unwind
UNLESS EQ(dynvec_at(d, 1), 1, 102) DO GOTO unwind
UNLESS EQ(dynvec_at(d, 2), IR_HALF, 103) DO GOTO unwind
err := 0
unwind:
IF errlist DO free_errors(errlist)
IF d DO dynvec_free(d)
IF s DO scanner_free(s)
IF scb DO endstream(scb)
RESULTIS err
}
AND test_single_half_chain(r) = VALOF {
LET err = failat
LET scb, s, d = 0, 0, 0
LET expected = TABLE IR_LIT, 1, IR_HALF,
IR_LIT, 2, IR_HALF,
IR_LIT, 3, IR_HALF,
IR_LIT, 4, IR_HALF
LET errlist = 0
IF r DO RESULTIS r
testid := "test_single_half_chain"
scb := findinoutput("RAM:")
UNLESS NEQ(scb, 0, 0) DO GOTO unwind
{
LET outs = output()
selectoutput(scb)
writef(".half 1, 2, 3, 4*n")
selectoutput(outs)
rewindstream(scb)
}
s := make_scanner()
UNLESS NEQ(s, 0, 1) DO GOTO unwind
UNLESS EQ(scanner_get_stream(s, scb, "RAM:"), TRUE, 3) DO GOTO unwind
scanner_nextchar(s)
scanner_next(s)
d := make_dynvec()
UNLESS NEQ(d, 0, 4) DO GOTO unwind
parse(s, d, @errlist)
UNLESS EQ(errlist, 0, 5) DO GOTO unwind
UNLESS EQ(d!dv_length, 12, 100) DO GOTO unwind
FOR i = 0 TO 11 DO UNLESS EQ(dynvec_at(d, i), expected!i, 200+i) DO GOTO unwind
err := 0
unwind:
IF errlist DO free_errors(errlist)
IF d DO dynvec_free(d)
IF s DO scanner_free(s)
IF scb DO endstream(scb)
RESULTIS err
}
AND test_single_half_string(r) = VALOF {
LET err = failat
LET scb, s, d = 0, 0, 0
LET expected = TABLE IR_LIT, 6, IR_HALF,
IR_LIT, 'A', IR_HALF,
IR_LIT, 'b', IR_HALF,
IR_LIT, 'a', IR_HALF,
IR_LIT, 'c', IR_HALF,
IR_LIT, 'a', IR_HALF,
IR_LIT, 'b', IR_HALF
LET errlist = 0
IF r DO RESULTIS r
testid := "test_single_half_string"
scb := findinoutput("RAM:")
UNLESS NEQ(scb, 0, 0) DO GOTO unwind
{
LET outs = output()
selectoutput(scb)
writef(".half 6, *"Abacab*"*n")
selectoutput(outs)
rewindstream(scb)
}
s := make_scanner()
UNLESS NEQ(s, 0, 1) DO GOTO unwind
UNLESS EQ(scanner_get_stream(s, scb, "RAM:"), TRUE, 3) DO GOTO unwind
scanner_nextchar(s)
scanner_next(s)
d := make_dynvec()
UNLESS NEQ(d, 0, 4) DO GOTO unwind
parse(s, d, @errlist)
UNLESS EQ(errlist, 0, 5) DO GOTO unwind
UNLESS EQ(d!dv_length, 21, 100) DO GOTO unwind
FOR i = 0 TO 20 DO UNLESS EQ(dynvec_at(d, i), expected!i, 200+i) DO GOTO unwind
err := 0
unwind:
IF errlist DO free_errors(errlist)
IF d DO dynvec_free(d)
IF s DO scanner_free(s)
IF scb DO endstream(scb)
RESULTIS err
}
// Parser Tests: Simple listings: 8-bit bytes
AND test_single_byte(r) = VALOF {
LET err = failat
LET scb, s, d = 0, 0, 0
LET errlist = 0
IF r DO RESULTIS r
testid := "test_single_byte"
scb := findinoutput("RAM:")
UNLESS NEQ(scb, 0, 0) DO GOTO unwind
{
LET outs = output()
selectoutput(scb)
writef(".byte 1*n")
selectoutput(outs)
rewindstream(scb)
}
s := make_scanner()
UNLESS NEQ(s, 0, 1) DO GOTO unwind
UNLESS EQ(scanner_get_stream(s, scb, "RAM:"), TRUE, 3) DO GOTO unwind
scanner_nextchar(s)
scanner_next(s)
d := make_dynvec()
UNLESS NEQ(d, 0, 4) DO GOTO unwind
parse(s, d, @errlist)
UNLESS EQ(errlist, 0, 5) DO GOTO unwind
UNLESS EQ(d!dv_length, 3, 100) DO GOTO unwind
UNLESS EQ(dynvec_at(d, 0), IR_LIT, 101) DO GOTO unwind
UNLESS EQ(dynvec_at(d, 1), 1, 102) DO GOTO unwind
UNLESS EQ(dynvec_at(d, 2), IR_BYTE, 103) DO GOTO unwind
err := 0
unwind:
IF errlist DO free_errors(errlist)
IF d DO dynvec_free(d)
IF s DO scanner_free(s)
IF scb DO endstream(scb)
RESULTIS err
}
AND test_single_byte_chain(r) = VALOF {
LET err = failat
LET scb, s, d = 0, 0, 0
LET expected = TABLE IR_LIT, 1, IR_BYTE,
IR_LIT, 2, IR_BYTE,
IR_LIT, 3, IR_BYTE,
IR_LIT, 4, IR_BYTE
LET errlist = 0
IF r DO RESULTIS r
testid := "test_single_byte_chain"
scb := findinoutput("RAM:")
UNLESS NEQ(scb, 0, 0) DO GOTO unwind
{
LET outs = output()
selectoutput(scb)
writef(".byte 1, 2, 3, 4*n")
selectoutput(outs)
rewindstream(scb)
}
s := make_scanner()
UNLESS NEQ(s, 0, 1) DO GOTO unwind
UNLESS EQ(scanner_get_stream(s, scb, "RAM:"), TRUE, 3) DO GOTO unwind
scanner_nextchar(s)
scanner_next(s)
d := make_dynvec()
UNLESS NEQ(d, 0, 4) DO GOTO unwind
parse(s, d, @errlist)
UNLESS EQ(errlist, 0, 5) DO GOTO unwind
UNLESS EQ(d!dv_length, 12, 100) DO GOTO unwind
FOR i = 0 TO 11 DO UNLESS EQ(dynvec_at(d, i), expected!i, 200+i) DO GOTO unwind
err := 0
unwind:
IF errlist DO free_errors(errlist)
IF d DO dynvec_free(d)
IF s DO scanner_free(s)
IF scb DO endstream(scb)
RESULTIS err
}
AND test_single_byte_string(r) = VALOF {
LET err = failat
LET scb, s, d = 0, 0, 0
LET expected = TABLE IR_LIT, 6, IR_BYTE,
IR_LIT, 'A', IR_BYTE,
IR_LIT, 'b', IR_BYTE,
IR_LIT, 'a', IR_BYTE,
IR_LIT, 'c', IR_BYTE,
IR_LIT, 'a', IR_BYTE,
IR_LIT, 'b', IR_BYTE
LET errlist = 0
IF r DO RESULTIS r
testid := "test_single_byte_string"
scb := findinoutput("RAM:")
UNLESS NEQ(scb, 0, 0) DO GOTO unwind
{
LET outs = output()
selectoutput(scb)
writef(".byte 6, *"Abacab*"*n")
selectoutput(outs)
rewindstream(scb)
}
s := make_scanner()
UNLESS NEQ(s, 0, 1) DO GOTO unwind
UNLESS EQ(scanner_get_stream(s, scb, "RAM:"), TRUE, 3) DO GOTO unwind
scanner_nextchar(s)
scanner_next(s)
d := make_dynvec()
UNLESS NEQ(d, 0, 4) DO GOTO unwind
parse(s, d, @errlist)
UNLESS EQ(errlist, 0, 5) DO GOTO unwind
UNLESS EQ(d!dv_length, 21, 100) DO GOTO unwind
FOR i = 0 TO 20 DO UNLESS EQ(dynvec_at(d, i), expected!i, 200+i) DO GOTO unwind
err := 0
unwind:
IF errlist DO free_errors(errlist)
IF d DO dynvec_free(d)
IF s DO scanner_free(s)
IF scb DO endstream(scb)
RESULTIS err
}
|