[Search for users]
[Overall Top Noters]
[List of all Conferences]
[Download this site]
| Title: | USG buildhelp questions/answers |
|
| Moderator: | SMURF::FILTER |
|
| Created: | Mon Apr 26 1993 |
| Last Modified: | Mon Jan 20 1997 |
| Last Successful Update: | Fri Jun 06 1997 |
| Number of topics: | 2763 |
| Total number of notes: | 5802 |
364.0. "bsubmit problem; 2nd request for help" by SMURF::FILTER (Automatic Posting Software - mail to flume::puck) Mon Oct 04 1993 15:30
Date Of Receipt: 4-OCT-1993 13:35:32.06
From: QUARRY::clark "Chris Clark USG"
To: odehelp@DEC:.zko.quarry
CC:
Subj: bsubmit problem; 2nd request for help
I aborted with "preserve" a submission and tried to do a bsubmit
-resub and now it has "lost" one of the files from its internal state.
[email protected]::/share/quarry/usr/staff/quarry3/clark/sandboxes/minor/src/usr/ccs/bin/uopt-:2> bsubmit uopttail.p
bsubmit uopttail.p
Enter the defect number this submission applies to: agosminor-1489-clark
agosminor-1489-clark
*** No user interaction will be required during the merge step. ***
[ ./usr/ccs/bin/uopt/uopttail.p checked in onto branch 4.2.6 ]
[ ./usr/ccs/bin/uopt/uopttail.p Rev 4.2.6.2 checked out ]
*** Please mail the log, /share/quarry/usr/staff/quarry3/clark/sandboxes/minor/src/10:23.Tlog,
*** to the appropriate people in your project then remove.
Outdate the submitted files from set Chris_Clark_minor?
Outdate files?: [Yes]
[ ./usr/ccs/bin/uopt/uopttail.p outdated revisions in set Chris_Clark_minor ]
Submission completed successfully.
[email protected]::/share/quarry/usr/staff/quarry3/clark/sandboxes/minor/src/usr/ccs/bin/uopt-:3> bsubmit *.[hp]
ls *.[hp]
uoptdcl.h uoptinit.p uoptpeep.p
[email protected]::/share/quarry/usr/staff/quarry3/clark/sandboxes/minor/src/usr/ccs/bin/uopt-:4> bsubmit *.[hp]
bsubmit *.[hp]
Enter the defect number this submission applies to: agosminor-1488-clark
agosminor-1488-clark
The following file(s) will require user interaction during the merge step:
./usr/ccs/bin/uopt/uoptpeep.p
12~
Do you wish to continue ?: [Yes] yes
yes
Abort, ok, edit, merge, [r]co, [r]diff [rdiff] diff
diff
===================================================================
RCS file: ./usr/ccs/bin/uopt/uoptpeep.p,v
retrieving revision 1.1.8.4
diff -r1.1.8.4 ./.rcstemp017937/uoptpeep.p
5a6,8
> Revision 1.1.9.3 1993/09/30 18:42:50 Chris_Clark
> Command line options for cmove merging.
>
10a14,16
> Revision 1.1.9.2 1993/09/03 19:13:49 Chris_Clark
> Fixed a noop block triangle case where cmoves were not getting generated because of a jmp to the label.
>
76a83,85
> Revision 1.1.2.5 93/01/14 13:51:05 Don_Courtney
> Correct the processing of the STOREOP data-flow set for store removals.
>
81,83d89
< Revision 1.1.2.5 93/01/14 13:51:05 Don_Courtney
< Correct the processing of the STOREOP data-flow set for store removals.
<
132d137
< /* #define SUPPRESS_BLOCK_MERGING any value suppresses ALL merging the head and tail of Ucond diamonds or triangles */
2605,2608c2610,2614
< isvar, issvar: begin
< if i^.kind = issvar then
< state := t_condition(i^.slink);
< state := state OR false;
---
> isvar: begin
> state := false;
> end {case isvar};
> issvar: begin
> state := t_condition(i^.slink);
2612d2617
< state := state OR false;
2641d2645
< state := state OR false;
2646d2649
< state := state OR false;
2650d2652
< state := state OR false;
2861,2863c2863
< #ifdef SUPPRESS_BLOCK_MERGING
< acceptable_predecessors_only := false;
< #else
---
> if no_cmove_merge then acceptable_predecessors_only := false
2865,2866c2865
< writeln("merging after ucond allowed");
< #endif
---
> else writeln("merging after ucond allowed")
2867a2867
> ;
3387c3387
< Ustr, Uisst /*, Uistr */:
---
> Ustr, Uisst:
3388a3389,3390
> Uistr:
> if no_cmove_istr then return else goto 10;
3410c3412
< Ustr, Uisst /*, Uistr */:
---
> Ustr, Uisst:
3411a3414,3415
> Uistr:
> if no_cmove_istr then return else goto 20;
Abort, ok, edit, merge, [r]co, [r]diff [ok] merge
merge
Abort, ok, edit, merge, [r]co, [r]diff [rdiff] diff
diff
===================================================================
RCS file: ./usr/ccs/bin/uopt/uoptpeep.p,v
retrieving revision 1.1.8.4
diff -r1.1.8.4 ./.rcstemp018273/uoptpeep.p
5a6,8
> Revision 1.1.9.3 1993/09/30 18:42:50 Chris_Clark
> Command line options for cmove merging.
>
10a14,16
> Revision 1.1.9.2 1993/09/03 19:13:49 Chris_Clark
> Fixed a noop block triangle case where cmoves were not getting generated because of a jmp to the label.
>
76a83,85
> Revision 1.1.2.5 93/01/14 13:51:05 Don_Courtney
> Correct the processing of the STOREOP data-flow set for store removals.
>
81,83d89
< Revision 1.1.2.5 93/01/14 13:51:05 Don_Courtney
< Correct the processing of the STOREOP data-flow set for store removals.
<
132d137
< /* #define SUPPRESS_BLOCK_MERGING any value suppresses ALL merging the head and tail of Ucond diamonds or triangles */
2605,2608c2610,2614
< isvar, issvar: begin
< if i^.kind = issvar then
< state := t_condition(i^.slink);
< state := state OR false;
---
> isvar: begin
> state := false;
> end {case isvar};
> issvar: begin
> state := t_condition(i^.slink);
2612d2617
< state := state OR false;
2641d2645
< state := state OR false;
2646d2649
< state := state OR false;
2650d2652
< state := state OR false;
2861,2863c2863
< #ifdef SUPPRESS_BLOCK_MERGING
< acceptable_predecessors_only := false;
< #else
---
> if no_cmove_merge then acceptable_predecessors_only := false
2865,2866c2865
< writeln("merging after ucond allowed");
< #endif
---
> else writeln("merging after ucond allowed")
2867a2867
> ;
3387c3387
< Ustr, Uisst /*, Uistr */:
---
> Ustr, Uisst:
3388a3389,3390
> Uistr:
> if no_cmove_istr then return else goto 10;
3410c3412
< Ustr, Uisst /*, Uistr */:
---
> Ustr, Uisst:
3411a3414,3415
> Uistr:
> if no_cmove_istr then return else goto 20;
Abort, ok, edit, merge, [r]co, [r]diff [ok] merge
merge
Abort, ok, edit, merge, [r]co, [r]diff [rdiff] diff
diff
===================================================================
RCS file: ./usr/ccs/bin/uopt/uoptpeep.p,v
retrieving revision 1.1.8.4
diff -r1.1.8.4 ./.rcstemp018292/uoptpeep.p
5a6,8
> Revision 1.1.9.3 1993/09/30 18:42:50 Chris_Clark
> Command line options for cmove merging.
>
10a14,16
> Revision 1.1.9.2 1993/09/03 19:13:49 Chris_Clark
> Fixed a noop block triangle case where cmoves were not getting generated because of a jmp to the label.
>
76a83,85
> Revision 1.1.2.5 93/01/14 13:51:05 Don_Courtney
> Correct the processing of the STOREOP data-flow set for store removals.
>
81,83d89
< Revision 1.1.2.5 93/01/14 13:51:05 Don_Courtney
< Correct the processing of the STOREOP data-flow set for store removals.
<
132d137
< /* #define SUPPRESS_BLOCK_MERGING any value suppresses ALL merging the head and tail of Ucond diamonds or triangles */
2605,2608c2610,2614
< isvar, issvar: begin
< if i^.kind = issvar then
< state := t_condition(i^.slink);
< state := state OR false;
---
> isvar: begin
> state := false;
> end {case isvar};
> issvar: begin
> state := t_condition(i^.slink);
2612d2617
< state := state OR false;
2641d2645
< state := state OR false;
2646d2649
< state := state OR false;
2650d2652
< state := state OR false;
2861,2863c2863
< #ifdef SUPPRESS_BLOCK_MERGING
< acceptable_predecessors_only := false;
< #else
---
> if no_cmove_merge then acceptable_predecessors_only := false
2865,2866c2865
< writeln("merging after ucond allowed");
< #endif
---
> else writeln("merging after ucond allowed")
2867a2867
> ;
3387c3387
< Ustr, Uisst /*, Uistr */:
---
> Ustr, Uisst:
3388a3389,3390
> Uistr:
> if no_cmove_istr then return else goto 10;
3410c3412
< Ustr, Uisst /*, Uistr */:
---
> Ustr, Uisst:
3411a3414,3415
> Uistr:
> if no_cmove_istr then return else goto 20;
Abort, ok, edit, merge, [r]co, [r]diff [ok] abort
abort
At this stage, you have two options:
-Preserve the state of your submission ( for -resub ),
bsubmit will keep all merging you have done.
-Clear the state of your submission ( no -resub ).
All merging work will be discarded.
Do you wish to (Pp)reserve or (Cc)lear the state
of your submission? : [Preserve]
*** RE-SUBMISSION REQUIRED ***
- Source control information is in an intermediate state.
- Re-submit using -resub 10:32 [ -date 10/4/93 ]
10:43 wall 3.73 sys 3.97 user 0 real 0 unshared 0 shared 0 stack 0 page 0 swaps 60 370 i/os
[email protected]::/share/quarry/usr/staff/quarry3/clark/sandboxes/minor/src/usr/ccs/bin/uopt-:5> bsubmit -resub 10:32
bsubmit -resub 10:32
Enter the defect number this submission applies to: agosminor-1488-clark
agosminor-1488-clark
>> FATAL ERROR in /usr/sde/tools/alpha_osf/bin/ode/bsubmit:
>> Discrepancy between bcs tracking file and hold file.
>> A file listed in the bcs tracking file was not present in the hold file.
>> File: './usr/ccs/bin/uopt/uoptdcl.h'
Please take appropriate steps and re-submit.
*** RE-SUBMISSION REQUIRED ***
- Source control information is in an intermediate state.
- Re-submit using -resub 10:32 [ -date 10/4/93 ]
[email protected]::/share/quarry/usr/staff/quarry3/clark/sandboxes/minor/src/usr/ccs/bin/uopt-:6> ls
ls
Makefile submit_request_6~ uoptinit.p~ uopttail.p~
Makefile~ uoptcopy.new uoptinput.new uopttrep.new
bdiff.log uoptdbg.hnew uoptpeep.ken uoptutil.hnew
submit_request_4 uoptdbg.new uoptpeep.new uoptutil.new
submit_request_5 uoptdcl.h uoptpeep.p
submit_request_5~ uoptdcl.h~ uoptpeep.save
submit_request_6 uoptinit.p uoptreg1.bad
| T.R | Title | User | Personal
Name | Date | Lines
|
|---|