Skip to content

Commit 07e9c20

Browse files
authored
Merge branch 'main' into patch-3
2 parents f4e96df + 7888061 commit 07e9c20

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

docs/build-insights/reference/sdk/functions/relog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,6 @@ The input trace is passed through the analyzer group *numberOfAnalysisPasses* ti
7777
7878
The relogging of system events like CPU samples from within a relogger class isn't supported. Use the *systemEventsRetentionFlags* parameter to decide which system events to keep in the output trace.
7979
80+
The `relog` function depends on the COM API. You must call `CoInitialize` before you call `relog`. Call `CoUninitialize` once `relog` has finished. If you call `relog` without a call to `CoInitialize` first, you'll get error code 9 (`RESULT_CODE_FAILURE_START_RELOGGER`).
81+
8082
::: moniker-end

docs/build/arm64ec-windows-abi-conventions.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,6 @@ When the helper then returns to the thunk, the thunk:
166166
1. Pops the ARM64EC `lr` register
167167
1. Executes an ARM64 `ret lr` instruction.
168168

169-
## x64 Unwinding of an ARM64EC function
170-
171-
### Recovering the return address
172-
173-
At the beginning of an x64 function, the stack pointer points to the return address that was pushed onto the stack by the caller's `call` instruction. In contrast, at the beginning of an ARM64EC function, the return address is in the `lr` register, set by the caller's `bl` instruction. Therefore, when unwinding the deepest frame of a stack, if the frame corresponds to an ARM64EC function, the x64 unwinder must recreate the value of ARM64EC `lr` by reading the value stashed in the x87 registers when the exception occurred. In addition, the new x64 unwind code `UWOP_SAVE_RET` handles the prolog saving ARM64EC `lr` to the stack.
174-
175169
## ARM64EC function name decoration
176170

177171
An ARM64EC function name has a secondary decoration applied after any language-specific decoration. For functions with C linkage (whether compiled as C or by using `extern "C"`), a `#` is prepended to the name. For C++ decorated functions, a `$$h` tag is inserted into the name.

docs/parallel/amp/using-cpp-amp-in-windows-store-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ You can use C++ AMP (C++ Accelerated Massive Parallelism) in your Universal Wind
1010

1111
## Performance considerations
1212

13-
If you're using Visual C++ component extensions C++/CX to create your Universal Windows Platform (UWP) app, we recommend that you use plain-old-data (POD) types together with contiguous storage—for example, `std::vector` or C-style arrays—for data that will be used with C++ AMP. This can help you achieve higher performance than by using non-POD types or Windows RT containers because no marshaling has to occur.
13+
If you're using Visual C++ component extensions C++/CX to create your Universal Windows Platform (UWP) app, we recommend that you use plain-old-data (POD) types together with contiguous storage—for example, `std::vector` or C-style arrays—for data that will be used with C++ AMP. This can help you achieve higher performance than by using non-POD types or Windows Runtime containers because no marshaling has to occur.
1414

1515
In a C++ AMP kernel, to access data that’s stored in this way, just wrap the `std::vector` or array storage in a `concurrency::array_view` and then use the array view in a `concurrency::parallel_for_each` loop:
1616

docs/standard-library/basic-istream-class.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ See the example for [`basic_ifstream` Class](../standard-library/basic-ifstream-
119119
|[`swap`](#swap)|Exchanges this `basic_istream` object for the provided `basic_istream` object parameter.|
120120
|[`sync`](#sync)|Synchronizes the stream's associated input device with the stream's buffer.|
121121
|[`tellg`](#tellg)|Reports the current read position in the stream.|
122-
|[u`nget](#unget)|Puts the most recently read character back into the stream.|
122+
|[`unget`](#unget)|Puts the most recently read character back into the stream.|
123123
124124
### Operators
125125
@@ -161,7 +161,7 @@ A `basic_istream` object to copy.
161161

162162
The first constructor initializes the base class by calling `init(strbuf)`. It also stores zero in the extraction count. For more information, see [`init`](../standard-library/basic-ios-class.md#init). And for more information about this extraction count, see the Remarks section of the [`basic_istream` Class](../standard-library/basic-istream-class.md) overview.
163163

164-
The second constructor initializes the base class by calling `move(right)`. It also stores `right.gcount()` in the extraction count and stores zero in the extraction count for *`right`**.
164+
The second constructor initializes the base class by calling `move(right)`. It also stores `right.gcount()` in the extraction count and stores zero in the extraction count for *`right`*.
165165

166166
### Example
167167

0 commit comments

Comments
 (0)