Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • utils/deriveConstants/Main.hs
    ... ... @@ -397,7 +397,6 @@ wanteds os = concat
    397 397
               ,fieldOffset Both "StgRegTable" "rHpAlloc"
    
    398 398
               ,structField C    "StgRegTable" "rCurrentAlloc"
    
    399 399
               ,structField C    "StgRegTable" "rRet"
    
    400
    -          ,structField C    "StgRegTable" "rNursery"
    
    401 400
     
    
    402 401
               ,defIntOffset Both "stgEagerBlackholeInfo"
    
    403 402
                                  "FUN_OFFSET(stgEagerBlackholeInfo)"
    
    ... ... @@ -405,7 +404,6 @@ wanteds os = concat
    405 404
               ,defIntOffset Both "stgGCFun"    "FUN_OFFSET(stgGCFun)"
    
    406 405
     
    
    407 406
               ,fieldOffset Both "Capability" "r"
    
    408
    -          ,fieldOffset C    "Capability" "lock"
    
    409 407
               ,structField C    "Capability" "no"
    
    410 408
               ,structField C    "Capability" "mut_lists"
    
    411 409
               ,structField C    "Capability" "context_switch"
    
    ... ... @@ -424,18 +422,11 @@ wanteds os = concat
    424 422
               ,structField C    "bdescr" "link"
    
    425 423
               ,structField Both "bdescr" "flags"
    
    426 424
     
    
    427
    -          ,structSize C  "generation"
    
    428 425
               ,structField C "generation" "n_new_large_words"
    
    429
    -          ,structField C "generation" "weak_ptr_list"
    
    430 426
     
    
    431 427
               ,structSize Both   "CostCentreStack"
    
    432
    -          ,structField C     "CostCentreStack" "ccsID"
    
    433 428
               ,structFieldH Both "CostCentreStack" "mem_alloc"
    
    434 429
               ,structFieldH Both "CostCentreStack" "scc_count"
    
    435
    -          ,structField C     "CostCentreStack" "prevStack"
    
    436
    -
    
    437
    -          ,structField C "CostCentre" "ccID"
    
    438
    -          ,structField C "CostCentre" "link"
    
    439 430
     
    
    440 431
               ,structField C     "StgHeader" "info"
    
    441 432
               ,structField_ Both "StgHeader_ccs" "StgHeader" "prof.ccs"
    
    ... ... @@ -472,18 +463,14 @@ wanteds os = concat
    472 463
               ,closurePayload C    "StgArrBytes" "payload"
    
    473 464
     
    
    474 465
               ,closureField  C    "StgTSO"      "_link"
    
    475
    -          ,closureField  C    "StgTSO"      "global_link"
    
    476 466
               ,closureField  C    "StgTSO"      "what_next"
    
    477 467
               ,closureField  C    "StgTSO"      "why_blocked"
    
    478 468
               ,closureField  C    "StgTSO"      "block_info"
    
    479 469
               ,closureField  C    "StgTSO"      "blocked_exceptions"
    
    480 470
               ,closureField  C    "StgTSO"      "id"
    
    481 471
               ,closureField  C    "StgTSO"      "cap"
    
    482
    -          ,closureField  C    "StgTSO"      "saved_errno"
    
    483 472
               ,closureField  C    "StgTSO"      "trec"
    
    484 473
               ,closureField  C    "StgTSO"      "flags"
    
    485
    -          ,closureField  C    "StgTSO"      "dirty"
    
    486
    -          ,closureField  C    "StgTSO"      "bq"
    
    487 474
               ,closureField  C    "StgTSO"      "label"
    
    488 475
               ,closureField  C    "StgTSO"      "bound"
    
    489 476
               ,closureField  Both "StgTSO"      "alloc_limit"
    
    ... ... @@ -496,8 +483,6 @@ wanteds os = concat
    496 483
               ,closureField       C    "StgStack" "dirty"
    
    497 484
               ,closureField       C    "StgStack" "marking"
    
    498 485
     
    
    499
    -          ,structSize C "StgTSOProfInfo"
    
    500
    -
    
    501 486
               ,closureField Both "StgUpdateFrame" "updatee"
    
    502 487
               ,closureField Both "StgOrigThunkInfoFrame" "info_ptr"
    
    503 488
     
    
    ... ... @@ -519,19 +504,15 @@ wanteds os = concat
    519 504
               ,closureFieldGcptr C "StgAP" "fun"
    
    520 505
               ,closurePayload    C "StgAP" "payload"
    
    521 506
     
    
    522
    -          ,thunkSize         C "StgAP_STACK"
    
    523 507
               ,closureField      C "StgAP_STACK" "size"
    
    524 508
               ,closureFieldGcptr C "StgAP_STACK" "fun"
    
    525 509
               ,closurePayload    C "StgAP_STACK" "payload"
    
    526 510
     
    
    527
    -          ,closureSize       C "StgContinuation"
    
    528 511
               ,closureField      C "StgContinuation" "apply_mask_frame"
    
    529 512
               ,closureField      C "StgContinuation" "mask_frame_offset"
    
    530 513
               ,closureField      C "StgContinuation" "stack_size"
    
    531 514
               ,closurePayload    C "StgContinuation" "stack"
    
    532 515
     
    
    533
    -          ,thunkSize C "StgSelector"
    
    534
    -
    
    535 516
               ,closureFieldGcptr C "StgInd" "indirectee"
    
    536 517
     
    
    537 518
               ,closureSize  C "StgMutVar"
    
    ... ... @@ -552,10 +533,6 @@ wanteds os = concat
    552 533
               ,closureField C "StgCatchRetryFrame" "first_code"
    
    553 534
               ,closureField C "StgCatchRetryFrame" "alt_code"
    
    554 535
     
    
    555
    -          ,closureField C "StgTVarWatchQueue" "closure"
    
    556
    -          ,closureField C "StgTVarWatchQueue" "next_queue_entry"
    
    557
    -          ,closureField C "StgTVarWatchQueue" "prev_queue_entry"
    
    558
    -
    
    559 536
               ,closureSize  C "StgTVar"
    
    560 537
               ,closureField C "StgTVar" "current_value"
    
    561 538
               ,closureField C "StgTVar" "first_watch_queue_entry"
    
    ... ... @@ -595,29 +572,19 @@ wanteds os = concat
    595 572
               ,closureSize  C "StgStableName"
    
    596 573
               ,closureField C "StgStableName" "sn"
    
    597 574
     
    
    598
    -          ,closureSize  C "StgBlockingQueue"
    
    599
    -          ,closureField C "StgBlockingQueue" "bh"
    
    600
    -          ,closureField C "StgBlockingQueue" "owner"
    
    601
    -          ,closureField C "StgBlockingQueue" "queue"
    
    602
    -          ,closureField C "StgBlockingQueue" "link"
    
    603
    -
    
    604 575
               ,closureSize  C "MessageBlackHole"
    
    605 576
               ,closureField C "MessageBlackHole" "link"
    
    606 577
               ,closureField C "MessageBlackHole" "tso"
    
    607 578
               ,closureField C "MessageBlackHole" "bh"
    
    608 579
     
    
    609
    -          ,closureSize  C "StgCompactNFData"
    
    610 580
               ,closureField C "StgCompactNFData" "totalW"
    
    611
    -          ,closureField C "StgCompactNFData" "autoBlockW"
    
    612 581
               ,closureField C "StgCompactNFData" "nursery"
    
    613
    -          ,closureField C "StgCompactNFData" "last"
    
    614 582
               ,closureField C "StgCompactNFData" "hp"
    
    615 583
               ,closureField C "StgCompactNFData" "hpLim"
    
    616 584
               ,closureField C "StgCompactNFData" "hash"
    
    617 585
               ,closureField C "StgCompactNFData" "result"
    
    618 586
     
    
    619 587
               ,structSize   C "StgCompactNFDataBlock"
    
    620
    -          ,structField  C "StgCompactNFDataBlock" "self"
    
    621 588
               ,structField  C "StgCompactNFDataBlock" "owner"
    
    622 589
               ,structField  C "StgCompactNFDataBlock" "next"
    
    623 590
     
    
    ... ... @@ -635,10 +602,7 @@ wanteds os = concat
    635 602
                               "RTS_FLAGS" "DebugFlags.zero_on_gc"
    
    636 603
               ,structField_ C "RtsFlags_GcFlags_initialStkSize"
    
    637 604
                               "RTS_FLAGS" "GcFlags.initialStkSize"
    
    638
    -          ,structField_ C "RtsFlags_MiscFlags_tickInterval"
    
    639
    -                          "RTS_FLAGS" "MiscFlags.tickInterval"
    
    640 605
     
    
    641
    -          ,structSize   C "StgFunInfoExtraFwd"
    
    642 606
               ,structField  C "StgFunInfoExtraFwd" "slow_apply"
    
    643 607
               ,structField  C "StgFunInfoExtraFwd" "fun_type"
    
    644 608
               ,structFieldH Both "StgFunInfoExtraFwd" "arity"
    
    ... ... @@ -652,11 +616,9 @@ wanteds os = concat
    652 616
               ,structField_ C    "StgFunInfoExtraRev_bitmap_offset" "StgFunInfoExtraRev" "b.bitmap_offset"
    
    653 617
     
    
    654 618
               ,structField C "StgLargeBitmap" "size"
    
    655
    -          ,fieldOffset C "StgLargeBitmap" "bitmap"
    
    656 619
     
    
    657 620
               ,structSize  C "snEntry"
    
    658 621
               ,structField C "snEntry" "sn_obj"
    
    659
    -          ,structField C "snEntry" "addr"
    
    660 622
     
    
    661 623
               ,structSize  C "spEntry"
    
    662 624
               ,structField C "spEntry" "addr"
    
    ... ... @@ -672,51 +634,15 @@ wanteds os = concat
    672 634
                else []
    
    673 635
     
    
    674 636
                -- struct HsIface
    
    675
    -          ,structField C "HsIface" "processRemoteCompletion_closure"
    
    676
    -          ,structField C "HsIface" "runIO_closure"
    
    677
    -          ,structField C "HsIface" "runNonIO_closure"
    
    678 637
               ,structField C "HsIface" "Z0T_closure"
    
    679 638
               ,structField C "HsIface" "True_closure"
    
    680 639
               ,structField C "HsIface" "False_closure"
    
    681
    -          ,structField C "HsIface" "unpackCString_closure"
    
    682
    -          ,structField C "HsIface" "runFinalizzerBatch_closure"
    
    683
    -          ,structField C "HsIface" "stackOverflow_closure"
    
    684 640
               ,structField C "HsIface" "heapOverflow_closure"
    
    685
    -          ,structField C "HsIface" "allocationLimitExceeded_closure"
    
    686
    -          ,structField C "HsIface" "blockedIndefinitelyOnMVar_closure"
    
    687
    -          ,structField C "HsIface" "blockedIndefinitelyOnSTM_closure"
    
    688 641
               ,structField C "HsIface" "cannotCompactFunction_closure"
    
    689 642
               ,structField C "HsIface" "cannotCompactPinned_closure"
    
    690 643
               ,structField C "HsIface" "cannotCompactMutable_closure"
    
    691
    -          ,structField C "HsIface" "nonTermination_closure"
    
    692 644
               ,structField C "HsIface" "nestedAtomically_closure"
    
    693 645
               ,structField C "HsIface" "noMatchingContinuationPrompt_closure"
    
    694
    -          ,structField C "HsIface" "blockedOnBadFD_closure"
    
    695
    -          ,structField C "HsIface" "runSparks_closure"
    
    696
    -          ,structField C "HsIface" "ensureIOManagerIsRunning_closure"
    
    697
    -          ,structField C "HsIface" "interruptIOManager_closure"
    
    698
    -          ,structField C "HsIface" "ioManagerCapabilitiesChanged_closure"
    
    699
    -          ,structField C "HsIface" "runHandlersPtr_closure"
    
    700
    -          ,structField C "HsIface" "flushStdHandles_closure"
    
    701
    -          ,structField C "HsIface" "runMainIO_closure"
    
    702
    -          ,structField C "HsIface" "Czh_con_info"
    
    703
    -          ,structField C "HsIface" "Izh_con_info"
    
    704
    -          ,structField C "HsIface" "Fzh_con_info"
    
    705
    -          ,structField C "HsIface" "Dzh_con_info"
    
    706
    -          ,structField C "HsIface" "Wzh_con_info"
    
    707
    -          ,structField C "HsIface" "runAllocationLimitHandler_closure"
    
    708
    -          ,structField C "HsIface" "Ptr_con_info"
    
    709
    -          ,structField C "HsIface" "FunPtr_con_info"
    
    710
    -          ,structField C "HsIface" "I8zh_con_info"
    
    711
    -          ,structField C "HsIface" "I16zh_con_info"
    
    712
    -          ,structField C "HsIface" "I32zh_con_info"
    
    713
    -          ,structField C "HsIface" "I64zh_con_info"
    
    714
    -          ,structField C "HsIface" "W8zh_con_info"
    
    715
    -          ,structField C "HsIface" "W16zh_con_info"
    
    716
    -          ,structField C "HsIface" "W32zh_con_info"
    
    717
    -          ,structField C "HsIface" "W64zh_con_info"
    
    718
    -          ,structField C "HsIface" "StablePtr_con_info"
    
    719
    -          ,structField C "HsIface" "StackSnapshot_closure"
    
    720 646
               ,structField C "HsIface" "divZZeroException_closure"
    
    721 647
               ,structField C "HsIface" "underflowException_closure"
    
    722 648
               ,structField C "HsIface" "overflowException_closure"