From: Russ Cox Date: Wed, 24 Sep 2008 22:28:03 +0000 (-0700) Subject: cleanup; sys.sleep can go. X-Git-Tag: weekly.2009-11-06~3129 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=afd04fdb98d7a19b312e288836b108507b176077;p=gostls13.git cleanup; sys.sleep can go. R=r OCL=15786 CL=15792 --- diff --git a/src/cmd/gc/sys.go b/src/cmd/gc/sys.go index 1660814ff0..a969ace605 100644 --- a/src/cmd/gc/sys.go +++ b/src/cmd/gc/sys.go @@ -76,7 +76,6 @@ func writefile(string, string) (bool); // write string into file; boolean status func bytestorune(*byte, int32, int32) (int32, int32); // convert bytes to runes func stringtorune(string, int32, int32) (int32, int32); // convert bytes to runes -func sleep(ms int64); func exit(int32); export @@ -163,6 +162,5 @@ export stringtorune // system calls - sleep exit ; diff --git a/src/cmd/gc/sysimport.c b/src/cmd/gc/sysimport.c index 07614367fd..ab124460d9 100644 --- a/src/cmd/gc/sysimport.c +++ b/src/cmd/gc/sysimport.c @@ -1,12 +1,11 @@ char* sysimport = "package sys\n" "type sys._esys_002 {}\n" - "type sys.any 24\n" "type sys._esys_003 *sys.any\n" - "type sys._osys_429 {_esys_427 sys._esys_003}\n" + "type sys._osys_457 {_esys_455 sys._esys_003}\n" "type sys.uint32 6\n" - "type sys._isys_431 {_esys_428 sys.uint32}\n" - "type sys._esys_001 (sys._esys_002 sys._osys_429 sys._isys_431)\n" + "type sys._isys_459 {_esys_456 sys.uint32}\n" + "type sys._esys_001 (sys._esys_002 sys._osys_457 sys._isys_459)\n" "var !sys.mal sys._esys_001\n" "type sys._esys_005 {}\n" "type sys._esys_006 {}\n" @@ -26,296 +25,297 @@ char* sysimport = "type sys._esys_017 {}\n" "type sys._esys_018 {}\n" "type sys.int32 5\n" - "type sys._isys_439 {_esys_438 sys.int32}\n" - "type sys._esys_016 (sys._esys_017 sys._esys_018 sys._isys_439)\n" + "type sys._isys_467 {_esys_466 sys.int32}\n" + "type sys._esys_016 (sys._esys_017 sys._esys_018 sys._isys_467)\n" "var !sys.panicl sys._esys_016\n" "type sys._esys_020 {}\n" "type sys._esys_021 {}\n" "type sys.bool 12\n" - "type sys._isys_444 {_esys_443 sys.bool}\n" - "type sys._esys_019 (sys._esys_020 sys._esys_021 sys._isys_444)\n" + "type sys._isys_472 {_esys_471 sys.bool}\n" + "type sys._esys_019 (sys._esys_020 sys._esys_021 sys._isys_472)\n" "var !sys.printbool sys._esys_019\n" "type sys._esys_023 {}\n" "type sys._esys_024 {}\n" "type sys.float64 10\n" - "type sys._isys_449 {_esys_448 sys.float64}\n" - "type sys._esys_022 (sys._esys_023 sys._esys_024 sys._isys_449)\n" + "type sys._isys_477 {_esys_476 sys.float64}\n" + "type sys._esys_022 (sys._esys_023 sys._esys_024 sys._isys_477)\n" "var !sys.printfloat sys._esys_022\n" "type sys._esys_026 {}\n" "type sys._esys_027 {}\n" "type sys.int64 7\n" - "type sys._isys_454 {_esys_453 sys.int64}\n" - "type sys._esys_025 (sys._esys_026 sys._esys_027 sys._isys_454)\n" + "type sys._isys_482 {_esys_481 sys.int64}\n" + "type sys._esys_025 (sys._esys_026 sys._esys_027 sys._isys_482)\n" "var !sys.printint sys._esys_025\n" "type sys._esys_029 {}\n" "type sys._esys_030 {}\n" "type sys._esys_031 25\n" "type sys.string *sys._esys_031\n" - "type sys._isys_459 {_esys_458 sys.string}\n" - "type sys._esys_028 (sys._esys_029 sys._esys_030 sys._isys_459)\n" + "type sys._isys_487 {_esys_486 sys.string}\n" + "type sys._esys_028 (sys._esys_029 sys._esys_030 sys._isys_487)\n" "var !sys.printstring sys._esys_028\n" "type sys._esys_033 {}\n" "type sys._esys_034 {}\n" "type sys._esys_035 *sys.any\n" - "type sys._isys_464 {_esys_463 sys._esys_035}\n" - "type sys._esys_032 (sys._esys_033 sys._esys_034 sys._isys_464)\n" + "type sys._isys_492 {_esys_491 sys._esys_035}\n" + "type sys._esys_032 (sys._esys_033 sys._esys_034 sys._isys_492)\n" "var !sys.printpointer sys._esys_032\n" "type sys._esys_037 {}\n" "type sys._esys_038 {}\n" - "type sys._isys_469 {_esys_468 sys.any}\n" - "type sys._esys_036 (sys._esys_037 sys._esys_038 sys._isys_469)\n" + "type sys.any 24\n" + "type sys._isys_497 {_esys_496 sys.any}\n" + "type sys._esys_036 (sys._esys_037 sys._esys_038 sys._isys_497)\n" "var !sys.printinter sys._esys_036\n" "type sys._esys_040 {}\n" - "type sys._osys_476 {_esys_473 sys.string}\n" - "type sys._isys_478 {_esys_474 sys.string _esys_475 sys.string}\n" - "type sys._esys_039 (sys._esys_040 sys._osys_476 sys._isys_478)\n" + "type sys._osys_504 {_esys_501 sys.string}\n" + "type sys._isys_506 {_esys_502 sys.string _esys_503 sys.string}\n" + "type sys._esys_039 (sys._esys_040 sys._osys_504 sys._isys_506)\n" "var !sys.catstring sys._esys_039\n" "type sys._esys_042 {}\n" - "type sys._osys_486 {_esys_483 sys.int32}\n" - "type sys._isys_488 {_esys_484 sys.string _esys_485 sys.string}\n" - "type sys._esys_041 (sys._esys_042 sys._osys_486 sys._isys_488)\n" + "type sys._osys_514 {_esys_511 sys.int32}\n" + "type sys._isys_516 {_esys_512 sys.string _esys_513 sys.string}\n" + "type sys._esys_041 (sys._esys_042 sys._osys_514 sys._isys_516)\n" "var !sys.cmpstring sys._esys_041\n" "type sys._esys_044 {}\n" - "type sys._osys_497 {_esys_493 sys.string}\n" - "type sys._isys_499 {_esys_494 sys.string _esys_495 sys.int32 _esys_496 sys.int32}\n" - "type sys._esys_043 (sys._esys_044 sys._osys_497 sys._isys_499)\n" + "type sys._osys_525 {_esys_521 sys.string}\n" + "type sys._isys_527 {_esys_522 sys.string _esys_523 sys.int32 _esys_524 sys.int32}\n" + "type sys._esys_043 (sys._esys_044 sys._osys_525 sys._isys_527)\n" "var !sys.slicestring sys._esys_043\n" "type sys._esys_046 {}\n" "type sys.uint8 2\n" - "type sys._osys_508 {_esys_505 sys.uint8}\n" - "type sys._isys_510 {_esys_506 sys.string _esys_507 sys.int32}\n" - "type sys._esys_045 (sys._esys_046 sys._osys_508 sys._isys_510)\n" + "type sys._osys_536 {_esys_533 sys.uint8}\n" + "type sys._isys_538 {_esys_534 sys.string _esys_535 sys.int32}\n" + "type sys._esys_045 (sys._esys_046 sys._osys_536 sys._isys_538)\n" "var !sys.indexstring sys._esys_045\n" "type sys._esys_048 {}\n" - "type sys._osys_517 {_esys_515 sys.string}\n" - "type sys._isys_519 {_esys_516 sys.int64}\n" - "type sys._esys_047 (sys._esys_048 sys._osys_517 sys._isys_519)\n" + "type sys._osys_545 {_esys_543 sys.string}\n" + "type sys._isys_547 {_esys_544 sys.int64}\n" + "type sys._esys_047 (sys._esys_048 sys._osys_545 sys._isys_547)\n" "var !sys.intstring sys._esys_047\n" "type sys._esys_050 {}\n" - "type sys._osys_526 {_esys_523 sys.string}\n" + "type sys._osys_554 {_esys_551 sys.string}\n" "type sys._esys_051 *sys.uint8\n" - "type sys._isys_528 {_esys_524 sys._esys_051 _esys_525 sys.int32}\n" - "type sys._esys_049 (sys._esys_050 sys._osys_526 sys._isys_528)\n" + "type sys._isys_556 {_esys_552 sys._esys_051 _esys_553 sys.int32}\n" + "type sys._esys_049 (sys._esys_050 sys._osys_554 sys._isys_556)\n" "var !sys.byteastring sys._esys_049\n" "type sys._esys_053 {}\n" - "type sys._osys_535 {_esys_533 sys.string}\n" + "type sys._osys_563 {_esys_561 sys.string}\n" "type sys._esys_055 [] sys.uint8\n" "type sys._esys_054 *sys._esys_055\n" - "type sys._isys_537 {_esys_534 sys._esys_054}\n" - "type sys._esys_052 (sys._esys_053 sys._osys_535 sys._isys_537)\n" + "type sys._isys_565 {_esys_562 sys._esys_054}\n" + "type sys._esys_052 (sys._esys_053 sys._osys_563 sys._isys_565)\n" "var !sys.arraystring sys._esys_052\n" "type sys._esys_057 {}\n" - "type sys._osys_541 {ret sys.any}\n" + "type sys._osys_569 {ret sys.any}\n" "type sys._esys_058 *sys.uint8\n" "type sys._esys_059 *sys.uint8\n" - "type sys._isys_543 {sigi sys._esys_058 sigt sys._esys_059 elem sys.any}\n" - "type sys._esys_056 (sys._esys_057 sys._osys_541 sys._isys_543)\n" + "type sys._isys_571 {sigi sys._esys_058 sigt sys._esys_059 elem sys.any}\n" + "type sys._esys_056 (sys._esys_057 sys._osys_569 sys._isys_571)\n" "var !sys.ifaceT2I sys._esys_056\n" "type sys._esys_061 {}\n" - "type sys._osys_550 {ret sys.any}\n" + "type sys._osys_578 {ret sys.any}\n" "type sys._esys_062 *sys.uint8\n" - "type sys._isys_552 {sigt sys._esys_062 iface sys.any}\n" - "type sys._esys_060 (sys._esys_061 sys._osys_550 sys._isys_552)\n" + "type sys._isys_580 {sigt sys._esys_062 iface sys.any}\n" + "type sys._esys_060 (sys._esys_061 sys._osys_578 sys._isys_580)\n" "var !sys.ifaceI2T sys._esys_060\n" "type sys._esys_064 {}\n" - "type sys._osys_558 {ret sys.any}\n" + "type sys._osys_586 {ret sys.any}\n" "type sys._esys_065 *sys.uint8\n" - "type sys._isys_560 {sigi sys._esys_065 iface sys.any}\n" - "type sys._esys_063 (sys._esys_064 sys._osys_558 sys._isys_560)\n" + "type sys._isys_588 {sigi sys._esys_065 iface sys.any}\n" + "type sys._esys_063 (sys._esys_064 sys._osys_586 sys._isys_588)\n" "var !sys.ifaceI2I sys._esys_063\n" "type sys._esys_067 {}\n" - "type sys._osys_567 {_esys_566 sys.int32}\n" + "type sys._osys_595 {_esys_594 sys.int32}\n" "type sys._esys_068 {}\n" - "type sys._esys_066 (sys._esys_067 sys._osys_567 sys._esys_068)\n" + "type sys._esys_066 (sys._esys_067 sys._osys_595 sys._esys_068)\n" "var !sys.argc sys._esys_066\n" "type sys._esys_070 {}\n" - "type sys._osys_571 {_esys_570 sys.int32}\n" + "type sys._osys_599 {_esys_598 sys.int32}\n" "type sys._esys_071 {}\n" - "type sys._esys_069 (sys._esys_070 sys._osys_571 sys._esys_071)\n" + "type sys._esys_069 (sys._esys_070 sys._osys_599 sys._esys_071)\n" "var !sys.envc sys._esys_069\n" "type sys._esys_073 {}\n" - "type sys._osys_576 {_esys_574 sys.string}\n" - "type sys._isys_578 {_esys_575 sys.int32}\n" - "type sys._esys_072 (sys._esys_073 sys._osys_576 sys._isys_578)\n" + "type sys._osys_604 {_esys_602 sys.string}\n" + "type sys._isys_606 {_esys_603 sys.int32}\n" + "type sys._esys_072 (sys._esys_073 sys._osys_604 sys._isys_606)\n" "var !sys.argv sys._esys_072\n" "type sys._esys_075 {}\n" - "type sys._osys_584 {_esys_582 sys.string}\n" - "type sys._isys_586 {_esys_583 sys.int32}\n" - "type sys._esys_074 (sys._esys_075 sys._osys_584 sys._isys_586)\n" + "type sys._osys_612 {_esys_610 sys.string}\n" + "type sys._isys_614 {_esys_611 sys.int32}\n" + "type sys._esys_074 (sys._esys_075 sys._osys_612 sys._isys_614)\n" "var !sys.envv sys._esys_074\n" "type sys._esys_077 {}\n" - "type sys._osys_593 {_esys_590 sys.float64 _esys_591 sys.int32}\n" - "type sys._isys_595 {_esys_592 sys.float64}\n" - "type sys._esys_076 (sys._esys_077 sys._osys_593 sys._isys_595)\n" + "type sys._osys_621 {_esys_618 sys.float64 _esys_619 sys.int32}\n" + "type sys._isys_623 {_esys_620 sys.float64}\n" + "type sys._esys_076 (sys._esys_077 sys._osys_621 sys._isys_623)\n" "var !sys.frexp sys._esys_076\n" "type sys._esys_079 {}\n" - "type sys._osys_602 {_esys_599 sys.float64}\n" - "type sys._isys_604 {_esys_600 sys.float64 _esys_601 sys.int32}\n" - "type sys._esys_078 (sys._esys_079 sys._osys_602 sys._isys_604)\n" + "type sys._osys_630 {_esys_627 sys.float64}\n" + "type sys._isys_632 {_esys_628 sys.float64 _esys_629 sys.int32}\n" + "type sys._esys_078 (sys._esys_079 sys._osys_630 sys._isys_632)\n" "var !sys.ldexp sys._esys_078\n" "type sys._esys_081 {}\n" - "type sys._osys_612 {_esys_609 sys.float64 _esys_610 sys.float64}\n" - "type sys._isys_614 {_esys_611 sys.float64}\n" - "type sys._esys_080 (sys._esys_081 sys._osys_612 sys._isys_614)\n" + "type sys._osys_640 {_esys_637 sys.float64 _esys_638 sys.float64}\n" + "type sys._isys_642 {_esys_639 sys.float64}\n" + "type sys._esys_080 (sys._esys_081 sys._osys_640 sys._isys_642)\n" "var !sys.modf sys._esys_080\n" "type sys._esys_083 {}\n" - "type sys._osys_621 {_esys_618 sys.bool}\n" - "type sys._isys_623 {_esys_619 sys.float64 _esys_620 sys.int32}\n" - "type sys._esys_082 (sys._esys_083 sys._osys_621 sys._isys_623)\n" + "type sys._osys_649 {_esys_646 sys.bool}\n" + "type sys._isys_651 {_esys_647 sys.float64 _esys_648 sys.int32}\n" + "type sys._esys_082 (sys._esys_083 sys._osys_649 sys._isys_651)\n" "var !sys.isInf sys._esys_082\n" "type sys._esys_085 {}\n" - "type sys._osys_630 {_esys_628 sys.bool}\n" - "type sys._isys_632 {_esys_629 sys.float64}\n" - "type sys._esys_084 (sys._esys_085 sys._osys_630 sys._isys_632)\n" + "type sys._osys_658 {_esys_656 sys.bool}\n" + "type sys._isys_660 {_esys_657 sys.float64}\n" + "type sys._esys_084 (sys._esys_085 sys._osys_658 sys._isys_660)\n" "var !sys.isNaN sys._esys_084\n" "type sys._esys_087 {}\n" - "type sys._osys_638 {_esys_636 sys.float64}\n" - "type sys._isys_640 {_esys_637 sys.int32}\n" - "type sys._esys_086 (sys._esys_087 sys._osys_638 sys._isys_640)\n" + "type sys._osys_666 {_esys_664 sys.float64}\n" + "type sys._isys_668 {_esys_665 sys.int32}\n" + "type sys._esys_086 (sys._esys_087 sys._osys_666 sys._isys_668)\n" "var !sys.Inf sys._esys_086\n" "type sys._esys_089 {}\n" - "type sys._osys_645 {_esys_644 sys.float64}\n" + "type sys._osys_673 {_esys_672 sys.float64}\n" "type sys._esys_090 {}\n" - "type sys._esys_088 (sys._esys_089 sys._osys_645 sys._esys_090)\n" + "type sys._esys_088 (sys._esys_089 sys._osys_673 sys._esys_090)\n" "var !sys.NaN sys._esys_088\n" "type sys._esys_092 {}\n" "type sys._esys_094 [sys.any] sys.any\n" "type sys._esys_093 *sys._esys_094\n" - "type sys._osys_648 {hmap sys._esys_093}\n" - "type sys._isys_650 {keysize sys.uint32 valsize sys.uint32 keyalg sys.uint32 valalg sys.uint32 hint sys.uint32}\n" - "type sys._esys_091 (sys._esys_092 sys._osys_648 sys._isys_650)\n" + "type sys._osys_676 {hmap sys._esys_093}\n" + "type sys._isys_678 {keysize sys.uint32 valsize sys.uint32 keyalg sys.uint32 valalg sys.uint32 hint sys.uint32}\n" + "type sys._esys_091 (sys._esys_092 sys._osys_676 sys._isys_678)\n" "var !sys.newmap sys._esys_091\n" "type sys._esys_096 {}\n" - "type sys._osys_659 {val sys.any}\n" + "type sys._osys_687 {val sys.any}\n" "type sys._esys_098 [sys.any] sys.any\n" "type sys._esys_097 *sys._esys_098\n" - "type sys._isys_661 {hmap sys._esys_097 key sys.any}\n" - "type sys._esys_095 (sys._esys_096 sys._osys_659 sys._isys_661)\n" + "type sys._isys_689 {hmap sys._esys_097 key sys.any}\n" + "type sys._esys_095 (sys._esys_096 sys._osys_687 sys._isys_689)\n" "var !sys.mapaccess1 sys._esys_095\n" "type sys._esys_100 {}\n" - "type sys._osys_667 {val sys.any pres sys.bool}\n" + "type sys._osys_695 {val sys.any pres sys.bool}\n" "type sys._esys_102 [sys.any] sys.any\n" "type sys._esys_101 *sys._esys_102\n" - "type sys._isys_669 {hmap sys._esys_101 key sys.any}\n" - "type sys._esys_099 (sys._esys_100 sys._osys_667 sys._isys_669)\n" + "type sys._isys_697 {hmap sys._esys_101 key sys.any}\n" + "type sys._esys_099 (sys._esys_100 sys._osys_695 sys._isys_697)\n" "var !sys.mapaccess2 sys._esys_099\n" "type sys._esys_104 {}\n" "type sys._esys_105 {}\n" "type sys._esys_107 [sys.any] sys.any\n" "type sys._esys_106 *sys._esys_107\n" - "type sys._isys_676 {hmap sys._esys_106 key sys.any val sys.any}\n" - "type sys._esys_103 (sys._esys_104 sys._esys_105 sys._isys_676)\n" + "type sys._isys_704 {hmap sys._esys_106 key sys.any val sys.any}\n" + "type sys._esys_103 (sys._esys_104 sys._esys_105 sys._isys_704)\n" "var !sys.mapassign1 sys._esys_103\n" "type sys._esys_109 {}\n" "type sys._esys_110 {}\n" "type sys._esys_112 [sys.any] sys.any\n" "type sys._esys_111 *sys._esys_112\n" - "type sys._isys_682 {hmap sys._esys_111 key sys.any val sys.any pres sys.bool}\n" - "type sys._esys_108 (sys._esys_109 sys._esys_110 sys._isys_682)\n" + "type sys._isys_710 {hmap sys._esys_111 key sys.any val sys.any pres sys.bool}\n" + "type sys._esys_108 (sys._esys_109 sys._esys_110 sys._isys_710)\n" "var !sys.mapassign2 sys._esys_108\n" "type sys._esys_114 {}\n" "type sys._esys_116 1 sys.any\n" "type sys._esys_115 *sys._esys_116\n" - "type sys._osys_689 {hchan sys._esys_115}\n" - "type sys._isys_691 {elemsize sys.uint32 elemalg sys.uint32 hint sys.uint32}\n" - "type sys._esys_113 (sys._esys_114 sys._osys_689 sys._isys_691)\n" + "type sys._osys_717 {hchan sys._esys_115}\n" + "type sys._isys_719 {elemsize sys.uint32 elemalg sys.uint32 hint sys.uint32}\n" + "type sys._esys_113 (sys._esys_114 sys._osys_717 sys._isys_719)\n" "var !sys.newchan sys._esys_113\n" "type sys._esys_118 {}\n" - "type sys._osys_698 {elem sys.any}\n" + "type sys._osys_726 {elem sys.any}\n" "type sys._esys_120 1 sys.any\n" "type sys._esys_119 *sys._esys_120\n" - "type sys._isys_700 {hchan sys._esys_119}\n" - "type sys._esys_117 (sys._esys_118 sys._osys_698 sys._isys_700)\n" + "type sys._isys_728 {hchan sys._esys_119}\n" + "type sys._esys_117 (sys._esys_118 sys._osys_726 sys._isys_728)\n" "var !sys.chanrecv1 sys._esys_117\n" "type sys._esys_122 {}\n" - "type sys._osys_705 {elem sys.any pres sys.bool}\n" + "type sys._osys_733 {elem sys.any pres sys.bool}\n" "type sys._esys_124 1 sys.any\n" "type sys._esys_123 *sys._esys_124\n" - "type sys._isys_707 {hchan sys._esys_123}\n" - "type sys._esys_121 (sys._esys_122 sys._osys_705 sys._isys_707)\n" + "type sys._isys_735 {hchan sys._esys_123}\n" + "type sys._esys_121 (sys._esys_122 sys._osys_733 sys._isys_735)\n" "var !sys.chanrecv2 sys._esys_121\n" "type sys._esys_126 {}\n" - "type sys._osys_713 {pres sys.bool}\n" + "type sys._osys_741 {pres sys.bool}\n" "type sys._esys_128 1 sys.any\n" "type sys._esys_127 *sys._esys_128\n" "type sys._esys_129 *sys.any\n" - "type sys._isys_715 {hchan sys._esys_127 elem sys._esys_129}\n" - "type sys._esys_125 (sys._esys_126 sys._osys_713 sys._isys_715)\n" + "type sys._isys_743 {hchan sys._esys_127 elem sys._esys_129}\n" + "type sys._esys_125 (sys._esys_126 sys._osys_741 sys._isys_743)\n" "var !sys.chanrecv3 sys._esys_125\n" "type sys._esys_131 {}\n" "type sys._esys_132 {}\n" "type sys._esys_134 1 sys.any\n" "type sys._esys_133 *sys._esys_134\n" - "type sys._isys_721 {hchan sys._esys_133 elem sys.any}\n" - "type sys._esys_130 (sys._esys_131 sys._esys_132 sys._isys_721)\n" + "type sys._isys_749 {hchan sys._esys_133 elem sys.any}\n" + "type sys._esys_130 (sys._esys_131 sys._esys_132 sys._isys_749)\n" "var !sys.chansend1 sys._esys_130\n" "type sys._esys_136 {}\n" - "type sys._osys_726 {pres sys.bool}\n" + "type sys._osys_754 {pres sys.bool}\n" "type sys._esys_138 1 sys.any\n" "type sys._esys_137 *sys._esys_138\n" - "type sys._isys_728 {hchan sys._esys_137 elem sys.any}\n" - "type sys._esys_135 (sys._esys_136 sys._osys_726 sys._isys_728)\n" + "type sys._isys_756 {hchan sys._esys_137 elem sys.any}\n" + "type sys._esys_135 (sys._esys_136 sys._osys_754 sys._isys_756)\n" "var !sys.chansend2 sys._esys_135\n" "type sys._esys_140 {}\n" "type sys._esys_141 *sys.uint8\n" - "type sys._osys_734 {sel sys._esys_141}\n" - "type sys._isys_736 {size sys.uint32}\n" - "type sys._esys_139 (sys._esys_140 sys._osys_734 sys._isys_736)\n" + "type sys._osys_762 {sel sys._esys_141}\n" + "type sys._isys_764 {size sys.uint32}\n" + "type sys._esys_139 (sys._esys_140 sys._osys_762 sys._isys_764)\n" "var !sys.newselect sys._esys_139\n" "type sys._esys_143 {}\n" - "type sys._osys_741 {selected sys.bool}\n" + "type sys._osys_769 {selected sys.bool}\n" "type sys._esys_144 *sys.uint8\n" "type sys._esys_146 1 sys.any\n" "type sys._esys_145 *sys._esys_146\n" - "type sys._isys_743 {sel sys._esys_144 hchan sys._esys_145 elem sys.any}\n" - "type sys._esys_142 (sys._esys_143 sys._osys_741 sys._isys_743)\n" + "type sys._isys_771 {sel sys._esys_144 hchan sys._esys_145 elem sys.any}\n" + "type sys._esys_142 (sys._esys_143 sys._osys_769 sys._isys_771)\n" "var !sys.selectsend sys._esys_142\n" "type sys._esys_148 {}\n" - "type sys._osys_750 {selected sys.bool}\n" + "type sys._osys_778 {selected sys.bool}\n" "type sys._esys_149 *sys.uint8\n" "type sys._esys_151 1 sys.any\n" "type sys._esys_150 *sys._esys_151\n" "type sys._esys_152 *sys.any\n" - "type sys._isys_752 {sel sys._esys_149 hchan sys._esys_150 elem sys._esys_152}\n" - "type sys._esys_147 (sys._esys_148 sys._osys_750 sys._isys_752)\n" + "type sys._isys_780 {sel sys._esys_149 hchan sys._esys_150 elem sys._esys_152}\n" + "type sys._esys_147 (sys._esys_148 sys._osys_778 sys._isys_780)\n" "var !sys.selectrecv sys._esys_147\n" "type sys._esys_154 {}\n" "type sys._esys_155 {}\n" "type sys._esys_156 *sys.uint8\n" - "type sys._isys_759 {sel sys._esys_156}\n" - "type sys._esys_153 (sys._esys_154 sys._esys_155 sys._isys_759)\n" + "type sys._isys_787 {sel sys._esys_156}\n" + "type sys._esys_153 (sys._esys_154 sys._esys_155 sys._isys_787)\n" "var !sys.selectgo sys._esys_153\n" "type sys._esys_158 {}\n" "type sys._esys_160 [] sys.any\n" "type sys._esys_159 *sys._esys_160\n" - "type sys._osys_763 {ary sys._esys_159}\n" - "type sys._isys_765 {nel sys.uint32 cap sys.uint32 width sys.uint32}\n" - "type sys._esys_157 (sys._esys_158 sys._osys_763 sys._isys_765)\n" + "type sys._osys_791 {ary sys._esys_159}\n" + "type sys._isys_793 {nel sys.uint32 cap sys.uint32 width sys.uint32}\n" + "type sys._esys_157 (sys._esys_158 sys._osys_791 sys._isys_793)\n" "var !sys.newarray sys._esys_157\n" "type sys._esys_162 {}\n" "type sys._esys_164 [] sys.any\n" "type sys._esys_163 *sys._esys_164\n" - "type sys._osys_772 {ary sys._esys_163}\n" + "type sys._osys_800 {ary sys._esys_163}\n" "type sys._esys_166 [] sys.any\n" "type sys._esys_165 *sys._esys_166\n" - "type sys._isys_774 {old sys._esys_165 lb sys.uint32 hb sys.uint32 width sys.uint32}\n" - "type sys._esys_161 (sys._esys_162 sys._osys_772 sys._isys_774)\n" + "type sys._isys_802 {old sys._esys_165 lb sys.uint32 hb sys.uint32 width sys.uint32}\n" + "type sys._esys_161 (sys._esys_162 sys._osys_800 sys._isys_802)\n" "var !sys.arraysliced sys._esys_161\n" "type sys._esys_168 {}\n" "type sys._esys_170 [] sys.any\n" "type sys._esys_169 *sys._esys_170\n" - "type sys._osys_782 {ary sys._esys_169}\n" + "type sys._osys_810 {ary sys._esys_169}\n" "type sys._esys_171 *sys.any\n" - "type sys._isys_784 {old sys._esys_171 nel sys.uint32 lb sys.uint32 hb sys.uint32 width sys.uint32}\n" - "type sys._esys_167 (sys._esys_168 sys._osys_782 sys._isys_784)\n" + "type sys._isys_812 {old sys._esys_171 nel sys.uint32 lb sys.uint32 hb sys.uint32 width sys.uint32}\n" + "type sys._esys_167 (sys._esys_168 sys._osys_810 sys._isys_812)\n" "var !sys.arrayslices sys._esys_167\n" "type sys._esys_173 {}\n" "type sys._esys_175 [] sys.any\n" "type sys._esys_174 *sys._esys_175\n" - "type sys._osys_793 {ary sys._esys_174}\n" + "type sys._osys_821 {ary sys._esys_174}\n" "type sys._esys_176 *sys.any\n" - "type sys._isys_795 {old sys._esys_176 nel sys.uint32}\n" - "type sys._esys_172 (sys._esys_173 sys._osys_793 sys._isys_795)\n" + "type sys._isys_823 {old sys._esys_176 nel sys.uint32}\n" + "type sys._esys_172 (sys._esys_173 sys._osys_821 sys._isys_823)\n" "var !sys.arrays2d sys._esys_172\n" "type sys._esys_178 {}\n" "type sys._esys_179 {}\n" @@ -328,39 +328,34 @@ char* sysimport = "type sys._esys_181 (sys._esys_182 sys._esys_183 sys._esys_184)\n" "var !sys.goexit sys._esys_181\n" "type sys._esys_186 {}\n" - "type sys._osys_806 {_esys_803 sys.string _esys_804 sys.bool}\n" - "type sys._isys_808 {_esys_805 sys.string}\n" - "type sys._esys_185 (sys._esys_186 sys._osys_806 sys._isys_808)\n" + "type sys._osys_834 {_esys_831 sys.string _esys_832 sys.bool}\n" + "type sys._isys_836 {_esys_833 sys.string}\n" + "type sys._esys_185 (sys._esys_186 sys._osys_834 sys._isys_836)\n" "var !sys.readfile sys._esys_185\n" "type sys._esys_188 {}\n" - "type sys._osys_815 {_esys_812 sys.bool}\n" - "type sys._isys_817 {_esys_813 sys.string _esys_814 sys.string}\n" - "type sys._esys_187 (sys._esys_188 sys._osys_815 sys._isys_817)\n" + "type sys._osys_843 {_esys_840 sys.bool}\n" + "type sys._isys_845 {_esys_841 sys.string _esys_842 sys.string}\n" + "type sys._esys_187 (sys._esys_188 sys._osys_843 sys._isys_845)\n" "var !sys.writefile sys._esys_187\n" "type sys._esys_190 {}\n" - "type sys._osys_827 {_esys_822 sys.int32 _esys_823 sys.int32}\n" + "type sys._osys_855 {_esys_850 sys.int32 _esys_851 sys.int32}\n" "type sys._esys_191 *sys.uint8\n" - "type sys._isys_829 {_esys_824 sys._esys_191 _esys_825 sys.int32 _esys_826 sys.int32}\n" - "type sys._esys_189 (sys._esys_190 sys._osys_827 sys._isys_829)\n" + "type sys._isys_857 {_esys_852 sys._esys_191 _esys_853 sys.int32 _esys_854 sys.int32}\n" + "type sys._esys_189 (sys._esys_190 sys._osys_855 sys._isys_857)\n" "var !sys.bytestorune sys._esys_189\n" "type sys._esys_193 {}\n" - "type sys._osys_840 {_esys_835 sys.int32 _esys_836 sys.int32}\n" - "type sys._isys_842 {_esys_837 sys.string _esys_838 sys.int32 _esys_839 sys.int32}\n" - "type sys._esys_192 (sys._esys_193 sys._osys_840 sys._isys_842)\n" + "type sys._osys_868 {_esys_863 sys.int32 _esys_864 sys.int32}\n" + "type sys._isys_870 {_esys_865 sys.string _esys_866 sys.int32 _esys_867 sys.int32}\n" + "type sys._esys_192 (sys._esys_193 sys._osys_868 sys._isys_870)\n" "var !sys.stringtorune sys._esys_192\n" "type sys._esys_195 {}\n" "type sys._esys_196 {}\n" - "type sys._isys_848 {ms sys.int64}\n" - "type sys._esys_194 (sys._esys_195 sys._esys_196 sys._isys_848)\n" - "var !sys.sleep sys._esys_194\n" + "type sys._isys_877 {_esys_876 sys.int32}\n" + "type sys._esys_194 (sys._esys_195 sys._esys_196 sys._isys_877)\n" + "var !sys.exit sys._esys_194\n" "type sys._esys_198 {}\n" "type sys._esys_199 {}\n" - "type sys._isys_853 {_esys_852 sys.int32}\n" - "type sys._esys_197 (sys._esys_198 sys._esys_199 sys._isys_853)\n" - "var !sys.exit sys._esys_197\n" - "type sys._esys_201 {}\n" - "type sys._esys_202 {}\n" - "type sys._esys_203 {}\n" - "type sys._esys_200 (sys._esys_201 sys._esys_202 sys._esys_203)\n" + "type sys._esys_200 {}\n" + "type sys._esys_197 (sys._esys_198 sys._esys_199 sys._esys_200)\n" "))\n" ; diff --git a/src/runtime/amd64_darwin.h b/src/runtime/amd64_darwin.h index 117c985a1d..45174cb42a 100644 --- a/src/runtime/amd64_darwin.h +++ b/src/runtime/amd64_darwin.h @@ -51,7 +51,6 @@ struct stat { // really a stat64 void bsdthread_create(void*, M*, G*, void(*)(void)); void bsdthread_register(void); -int64 select(int32, void*, void*, void*, struct timeval*); // Mach calls diff --git a/src/runtime/amd64_linux.h b/src/runtime/amd64_linux.h index fc70514ff0..0bc8283f21 100644 --- a/src/runtime/amd64_linux.h +++ b/src/runtime/amd64_linux.h @@ -49,5 +49,4 @@ struct stat { // Linux-specific system calls int64 futex(uint32*, int32, uint32, struct timespec*, uint32*, uint32); int64 clone(int32, void*, M*, G*, void(*)(void)); -int64 select(int32, void*, void*, void*, struct timeval*); diff --git a/src/runtime/rt1_amd64_darwin.c b/src/runtime/rt1_amd64_darwin.c index 2456bd7888..a908fa4623 100644 --- a/src/runtime/rt1_amd64_darwin.c +++ b/src/runtime/rt1_amd64_darwin.c @@ -204,16 +204,6 @@ unimplemented(int8 *name) *(int32*)1231 = 1231; } -void -sys·sleep(int64 ms) -{ - struct timeval tv; - - tv.tv_sec = ms/1000; - tv.tv_usec = ms%1000 * 1000; - select(0, nil, nil, nil, &tv); -} - // Thread-safe allocation of a semaphore. // Psema points at a kernel semaphore key. // It starts out zero, meaning no semaphore. diff --git a/src/runtime/rt1_amd64_linux.c b/src/runtime/rt1_amd64_linux.c index 98a53f18e8..97f022666a 100644 --- a/src/runtime/rt1_amd64_linux.c +++ b/src/runtime/rt1_amd64_linux.c @@ -440,16 +440,6 @@ newosproc(M *m, G *g, void *stk, void (*fn)(void)) *(int32*)123 = 123; } -void -sys·sleep(int64 ms) -{ - struct timeval tv; - - tv.tv_sec = ms/1000; - tv.tv_usec = ms%1000 * 1000; - select(0, nil, nil, nil, &tv); -} - void osinit(void) { diff --git a/src/runtime/sys_amd64_darwin.s b/src/runtime/sys_amd64_darwin.s index b690e3108a..6110362a7c 100644 --- a/src/runtime/sys_amd64_darwin.s +++ b/src/runtime/sys_amd64_darwin.s @@ -189,17 +189,6 @@ TEXT bsdthread_register(SB),7,$-8 CALL notok(SB) RET -// int64 select(int32, void*, void*, void*, void*) -TEXT select(SB),7,$0 - MOVL 8(SP), DI - MOVQ 16(SP), SI - MOVQ 24(SP), DX - MOVQ 32(SP), R10 - MOVQ 40(SP), R8 - MOVL $(0x2000000+407), AX // select_nocancel - SYSCALL - RET - // Mach system calls use 0x1000000 instead of the BSD's 0x2000000. // uint32 mach_msg_trap(void*, uint32, uint32, uint32, uint32, uint32, uint32) diff --git a/src/runtime/sys_amd64_linux.s b/src/runtime/sys_amd64_linux.s index 766ee8c9f5..581bf15ab5 100644 --- a/src/runtime/sys_amd64_linux.s +++ b/src/runtime/sys_amd64_linux.s @@ -182,17 +182,6 @@ TEXT clone(SB),7,$0 SYSCALL JMP -3(PC) // keep exiting -// int64 select(int32, void*, void*, void*, struct timeval*) -TEXT select(SB),7,$0 - MOVL 8(SP), DI - MOVQ 16(SP), SI - MOVQ 24(SP), DX - MOVQ 32(SP), R10 - MOVQ 40(SP), R8 - MOVL $23, AX - SYSCALL - RET - TEXT sigaltstack(SB),7,$-8 MOVQ new+8(SP), DI MOVQ old+16(SP), SI