Changeset 2a301ff for doc/papers/llheap/figures/AddressSpace.fig

Timestamp:

Aug 31, 2023, 11:31:15 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master, stuck-waitfor-destruct

Children:

950c58e

Parents:

92355883 (diff), 686912c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

• doc/papers/llheap/figures/AddressSpace.fig (modified) (1 diff)

doc/papers/llheap/figures/AddressSpace.fig

@@ -32 +32 @@
 2 2 0 1 0 7 60 -1 17 0.000 0 0 -1 0 0 5
          3900 1350 4800 1350 4800 2100 3900 2100 3900 1350
-4 0 0 50 -1 0 11 0.0000 2 180 900 1200 2325 high address\001
-4 2 0 50 -1 0 11 0.0000 2 135 855 6600 2325 low address\001
-4 1 0 50 -1 0 11 0.0000 2 120 330 6150 2025 Data\001
-4 1 0 50 -1 0 11 0.0000 2 135 675 6150 1800 Code and\001
-4 1 0 50 -1 0 11 0.0000 2 120 390 6150 1575 Static\001
-4 1 0 50 -1 0 11 0.0000 2 135 390 1650 1800 Stack\001
-4 1 0 50 -1 0 11 0.0000 2 165 615 2550 1950 Memory\001
-4 1 0 50 -1 0 11 0.0000 2 165 615 4350 1950 Memory\001
-4 1 0 50 -1 0 11 0.0000 2 120 315 2550 1650 Free\001
-4 1 0 50 -1 0 11 0.0000 2 120 330 3450 2025 Data\001
-4 1 0 50 -1 0 11 0.0000 2 135 675 3450 1800 Code and\001
-4 1 0 50 -1 0 11 0.0000 2 165 645 3450 1575 Dynamic\001
-4 1 0 50 -1 0 11 0.0000 2 120 315 4350 1650 Free\001
-4 1 0 50 -1 0 11 0.0000 2 120 735 5250 1950 Allocation\001
-4 1 0 50 -1 0 11 0.0000 2 165 645 5250 1650 Dynamic\001
+4 0 0 50 -1 0 10 0.0000 2 180 900 1200 2325 high address\001
+4 2 0 50 -1 0 10 0.0000 2 135 855 6600 2325 low address\001
+4 1 0 50 -1 0 10 0.0000 2 120 330 6150 2025 Data\001
+4 1 0 50 -1 0 10 0.0000 2 135 675 6150 1800 Code and\001
+4 1 0 50 -1 0 10 0.0000 2 120 390 6150 1575 Static\001
+4 1 0 50 -1 0 10 0.0000 2 135 390 1650 1800 Stack\001
+4 1 0 50 -1 0 10 0.0000 2 165 615 2550 1950 Memory\001
+4 1 0 50 -1 0 10 0.0000 2 165 615 4350 1950 Memory\001
+4 1 0 50 -1 0 10 0.0000 2 120 315 2550 1650 Free\001
+4 1 0 50 -1 0 10 0.0000 2 120 330 3450 2025 Data\001
+4 1 0 50 -1 0 10 0.0000 2 135 675 3450 1800 Code and\001
+4 1 0 50 -1 0 10 0.0000 2 165 645 3450 1575 Dynamic\001
+4 1 0 50 -1 0 10 0.0000 2 120 315 4350 1650 Free\001
+4 1 0 50 -1 0 10 0.0000 2 120 735 5250 1950 Allocation\001
+4 1 0 50 -1 0 10 0.0000 2 165 645 5250 1650 Dynamic\001