diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-11-07 06:44:46 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-11-07 06:44:46 +0530 |
| commit | d9dd67d90829ae2ce9422b264a1971e8e9c45c5a (patch) | |
| tree | 8248f11310c384dc53117fd80b32cc92dd61f3b9 | |
| parent | e42dbc26de03c61845f1bb357a910923dc5bc48f (diff) | |
| parent | 5eacf66c48db342b0e1056531307dbe318d9f16d (diff) | |
| download | rust-d9dd67d90829ae2ce9422b264a1971e8e9c45c5a.tar.gz rust-d9dd67d90829ae2ce9422b264a1971e8e9c45c5a.zip | |
Rollup merge of #29660 - steveklabnik:gh28461, r=brson
Fixes #28461
| -rw-r--r-- | src/doc/trpl/the-stack-and-the-heap.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/doc/trpl/the-stack-and-the-heap.md b/src/doc/trpl/the-stack-and-the-heap.md index 0bc2ca263d5..f835322ee71 100644 --- a/src/doc/trpl/the-stack-and-the-heap.md +++ b/src/doc/trpl/the-stack-and-the-heap.md @@ -74,7 +74,9 @@ visualize what’s going on with memory. Your operating system presents a view o memory to your program that’s pretty simple: a huge list of addresses, from 0 to a large number, representing how much RAM your computer has. For example, if you have a gigabyte of RAM, your addresses go from `0` to `1,073,741,823`. That -number comes from 2<sup>30</sup>, the number of bytes in a gigabyte. +number comes from 2<sup>30</sup>, the number of bytes in a gigabyte. [^gigabyte] + +[^gigabyte]: ‘Gigabyte’ can mean two things: 10^9, or 2^30. The SI standard resolved this by stating that ‘gigabyte’ is 10^9, and ‘gibibyte’ is 2^30. However, very few people use this terminology, and rely on context to differentiate. We follow in that tradition here. This memory is kind of like a giant array: addresses start at zero and go up to the final number. So here’s a diagram of our first stack frame: |
