Skip to content

Commit 98f81b4

Browse files
fenxuColin Robertson
fenxu
authored and
Colin Robertson
committed
Fix git push error for protected CLA branch (MicrosoftDocs#639)
* Fix typo * Consolidate 36 x64 conventions topics * Fix problem links, update redirects, rename a file
1 parent 796fdb1 commit 98f81b4

File tree

71 files changed

+1267
-1495
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1267
-1495
lines changed

‎.openpublishing.redirection.json

Lines changed: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,195 @@
240240
"redirect_url": "/cpp/build/reference/creating-precompiled-header-files#when-to-precompile-source-code",
241241
"redirect_document_id": false
242242
},
243+
244+
{
245+
"source_path": "docs/build/calling-convention.md",
246+
"redirect_url": "/cpp/build/x64-calling-convention",
247+
"redirect_document_id": true
248+
},
249+
{
250+
"source_path": "docs/build/parameter-passing.md",
251+
"redirect_url": "/cpp/build/x64-calling-convention#parameter-passing",
252+
"redirect_document_id": false
253+
},
254+
{
255+
"source_path": "docs/build/varargs.md",
256+
"redirect_url": "/cpp/build/x64-calling-convention#varargs",
257+
"redirect_document_id": false
258+
},
259+
{
260+
"source_path": "docs/build/unprototyped-functions.md",
261+
"redirect_url": "/cpp/build/x64-calling-convention#unprototyped-functions",
262+
"redirect_document_id": false
263+
},
264+
{
265+
"source_path": "docs/build/return-values-cpp.md",
266+
"redirect_url": "/cpp/build/x64-calling-convention#return-values",
267+
"redirect_document_id": false
268+
},
269+
{
270+
"source_path": "docs/build/caller-callee-saved-registers.md",
271+
"redirect_url": "/cpp/build/x64-calling-convention#callercallee-saved-registers",
272+
"redirect_document_id": false
273+
},
274+
{
275+
"source_path": "docs/build/function-pointers.md",
276+
"redirect_url": "/cpp/build/x64-calling-convention#function-pointers",
277+
"redirect_document_id": false
278+
},
279+
{
280+
"source_path": "docs/build/floating-point-support-for-older-code-visual-cpp.md",
281+
"redirect_url": "/cpp/build/x64-calling-convention#floating-point-support-for-older-code",
282+
"redirect_document_id": false
283+
},
284+
{
285+
"source_path": "docs/build/fpcsr.md",
286+
"redirect_url": "/cpp/build/x64-calling-convention#fpcsr",
287+
"redirect_document_id": false
288+
},
289+
{
290+
"source_path": "docs/build/mxcsr.md",
291+
"redirect_url": "/cpp/build/x64-calling-convention#mxcsr",
292+
"redirect_document_id": false
293+
},
294+
{
295+
"source_path": "docs/build/setjmp-longjump.md",
296+
"redirect_url": "/cpp/build/x64-calling-convention#setjmplongjmp",
297+
"redirect_document_id": false
298+
},
299+
300+
{
301+
"source_path": "docs/build/overview-of-x64-calling-conventions.md",
302+
"redirect_url": "/cpp/build/x64-software-conventions#overview-of-x64-calling-conventions",
303+
"redirect_document_id": false
304+
},
305+
{
306+
"source_path": "docs/build/types-and-storage.md",
307+
"redirect_url": "/cpp/build/x64-software-conventions#types-and-storage",
308+
"redirect_document_id": false
309+
},
310+
{
311+
"source_path": "docs/build/scalar-types.md",
312+
"redirect_url": "/cpp/build/x64-software-conventions#scalar-types",
313+
"redirect_document_id": false
314+
},
315+
{
316+
"source_path": "docs/build/aggregates-and-unions.md",
317+
"redirect_url": "/cpp/build/x64-software-conventions#aggregates-and-unions",
318+
"redirect_document_id": false
319+
},
320+
{
321+
"source_path": "docs/build/examples-of-structure-alignment.md",
322+
"redirect_url": "/cpp/build/x64-software-conventions#examples-of-structure-alignment",
323+
"redirect_document_id": false
324+
},
325+
{
326+
"source_path": "docs/build/bitfields.md",
327+
"redirect_url": "/cpp/build/x64-software-conventions#bitfields",
328+
"redirect_document_id": false
329+
},
330+
{
331+
"source_path": "docs/build/conflicts-with-the-x86-compiler.md",
332+
"redirect_url": "/cpp/build/x64-software-conventions#conflicts-with-the-x86-compiler",
333+
"redirect_document_id": false
334+
},
335+
{
336+
"source_path": "docs/build/register-usage.md",
337+
"redirect_url": "/cpp/build/x64-software-conventions#register-usage",
338+
"redirect_document_id": false
339+
},
340+
{
341+
"source_path": "docs/build/intrinsics-and-inline-assembly.md",
342+
"redirect_url": "/cpp/build/x64-software-conventions#intrinsics-and-inline-assembly",
343+
"redirect_document_id": false
344+
},
345+
{
346+
"source_path": "docs/build/image-format.md",
347+
"redirect_url": "/cpp/build/x64-software-conventions#image-format",
348+
"redirect_document_id": false
349+
},
350+
351+
{
352+
"source_path": "docs/build/stack-allocation.md",
353+
"redirect_url": "/cpp/build/stack-usage#stack-allocation",
354+
"redirect_document_id": false
355+
},
356+
{
357+
"source_path": "docs/build/dynamic-parameter-stack-area-construction.md",
358+
"redirect_url": "/cpp/build/stack-usage#dynamic-parameter-stack-area-construction",
359+
"redirect_document_id": false
360+
},
361+
{
362+
"source_path": "docs/build/function-types.md",
363+
"redirect_url": "/cpp/build/stack-usage#function-types",
364+
"redirect_document_id": false
365+
},
366+
{
367+
"source_path": "docs/build/malloc-alignment.md",
368+
"redirect_url": "/cpp/build/stack-usage#malloc-alignment",
369+
"redirect_document_id": false
370+
},
371+
{
372+
"source_path": "docs/build/alloca.md",
373+
"redirect_url": "/cpp/build/stack-usage#alloca",
374+
"redirect_document_id": false
375+
},
376+
377+
{
378+
"source_path": "docs/build/unwind-data-for-exception-handling-debugger-support.md",
379+
"redirect_url": "/cpp/build/exception-handling-x64#unwind-data-for-exception-handling-debugger-support",
380+
"redirect_document_id": false
381+
},
382+
{
383+
"source_path": "docs/build/struct-runtime-function.md",
384+
"redirect_url": "/cpp/build/exception-handling-x64#struct-runtime_function",
385+
"redirect_document_id": false
386+
},
387+
{
388+
"source_path": "docs/build/struct-unwind-code.md",
389+
"redirect_url": "/cpp/build/exception-handling-x64#struct-unwind_code",
390+
"redirect_document_id": false
391+
},
392+
{
393+
"source_path": "docs/build/struct-unwind-info.md",
394+
"redirect_url": "/cpp/build/exception-handling-x64#struct-unwind_info",
395+
"redirect_document_id": false
396+
},
397+
{
398+
"source_path": "docs/build/chained-unwind-info-structures.md",
399+
"redirect_url": "/cpp/build/exception-handling-x64#chained-unwind-info-structures",
400+
"redirect_document_id": false
401+
},
402+
{
403+
"source_path": "docs/build/unwind-procedure.md",
404+
"redirect_url": "/cpp/build/exception-handling-x64#unwind-procedure",
405+
"redirect_document_id": false
406+
},
407+
{
408+
"source_path": "docs/build/language-specific-handler.md",
409+
"redirect_url": "/cpp/build/exception-handling-x64#language-specific-handler",
410+
"redirect_document_id": false
411+
},
412+
{
413+
"source_path": "docs/build/unwind-helpers-for-masm.md",
414+
"redirect_url": "/cpp/build/exception-handling-x64#unwind-helpers-for-masm",
415+
"redirect_document_id": false
416+
},
417+
{
418+
"source_path": "docs/build/raw-pseudo-operations.md",
419+
"redirect_url": "/cpp/build/exception-handling-x64#raw-pseudo-operations",
420+
"redirect_document_id": false
421+
},
422+
{
423+
"source_path": "docs/build/masm-macros.md",
424+
"redirect_url": "/cpp/build/exception-handling-x64#masm-macros",
425+
"redirect_document_id": false
426+
},
427+
{
428+
"source_path": "docs/build/unwind-data-definitions-in-c.md",
429+
"redirect_url": "/cpp/build/exception-handling-x64#unwind-data-definitions-in-c",
430+
"redirect_document_id": false
431+
},
243432
{
244433
"source_path": "docs/c-language/index.md",
245434
"redirect_url": "/cpp/c-language/c-language-reference",

‎docs/build/TOC.md

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -14,47 +14,11 @@
1414
## [How to: Configure Visual C++ Projects to Target 64-Bit, x64 Platforms](how-to-configure-visual-cpp-projects-to-target-64-bit-platforms.md)
1515
## [How to: Enable a 64-Bit Visual C++ Toolset on the Command Line](how-to-enable-a-64-bit-visual-cpp-toolset-on-the-command-line.md)
1616
## [Common Visual C++ 64-bit Migration Issues](common-visual-cpp-64-bit-migration-issues.md)
17-
## [x64 Software Conventions](x64-software-conventions.md)
18-
### [Overview of x64 Calling Conventions](overview-of-x64-calling-conventions.md)
19-
### [Types and Storage](types-and-storage.md)
20-
#### [Scalar Types](scalar-types.md)
21-
#### [Aggregates and Unions](aggregates-and-unions.md)
22-
#### [Examples of Structure Alignment](examples-of-structure-alignment.md)
23-
#### [Bitfields](bitfields.md)
24-
#### [Conflicts with the x86 Compiler](conflicts-with-the-x86-compiler.md)
25-
### [Register Usage](register-usage.md)
26-
### [Calling Convention](calling-convention.md)
27-
#### [Parameter Passing](parameter-passing.md)
28-
#### [Varargs](varargs.md)
29-
#### [Unprototyped Functions](unprototyped-functions.md)
30-
#### [Return Values (C++)](return-values-cpp.md)
31-
#### [Caller-Callee Saved Registers](caller-callee-saved-registers.md)
32-
#### [Function Pointers](function-pointers.md)
33-
#### [Floating-Point Support for Older Code (Visual C++)](floating-point-support-for-older-code-visual-cpp.md)
34-
#### [FpCsr](fpcsr.md)
35-
#### [MxCsr](mxcsr.md)
36-
#### [setjmp-longjump](setjmp-longjump.md)
37-
### [Stack Usage](stack-usage.md)
38-
#### [Stack Allocation](stack-allocation.md)
39-
#### [Dynamic Parameter Stack Area Construction](dynamic-parameter-stack-area-construction.md)
40-
#### [Function Types](function-types.md)
41-
#### [malloc Alignment](malloc-alignment.md)
42-
#### [alloca](alloca.md)
43-
### [Prolog and Epilog](prolog-and-epilog.md)
44-
### [Exception Handling (x64)](exception-handling-x64.md)
45-
#### [Unwind Data for Exception Handling, Debugger Support](unwind-data-for-exception-handling-debugger-support.md)
46-
##### [struct RUNTIME_FUNCTION](struct-runtime-function.md)
47-
##### [struct UNWIND_INFO](struct-unwind-info.md)
48-
##### [struct UNWIND_CODE](struct-unwind-code.md)
49-
##### [Chained Unwind Info Structures](chained-unwind-info-structures.md)
50-
#### [Unwind Procedure](unwind-procedure.md)
51-
#### [Language Specific Handler](language-specific-handler.md)
52-
#### [Unwind Helpers for MASM](unwind-helpers-for-masm.md)
53-
##### [Raw Pseudo Operations](raw-pseudo-operations.md)
54-
##### [MASM Macros](masm-macros.md)
55-
#### [Unwind Data Definitions in C](unwind-data-definitions-in-c.md)
56-
### [Intrinsics and Inline Assembly](intrinsics-and-inline-assembly.md)
57-
### [Image Format](image-format.md)
17+
## [x64 software conventions](x64-software-conventions.md)
18+
### [x64 calling convention](x64-calling-convention.md)
19+
### [x64 stack usage](stack-usage.md)
20+
### [x64 prolog and epilog](prolog-and-epilog.md)
21+
### [x64 exception handling](exception-handling-x64.md)
5822
# [Configure Visual C++ for ARM processors](configuring-programs-for-arm-processors-visual-cpp.md)
5923
## [Common Visual C++ ARM Migration Issues](common-visual-cpp-arm-migration-issues.md)
6024
## [Overview of ARM ABI Conventions](overview-of-arm-abi-conventions.md)

‎docs/build/aggregates-and-unions.md

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎docs/build/alloca.md

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎docs/build/bitfields.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎docs/build/caller-callee-saved-registers.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎docs/build/calling-convention.md

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)