Merge 5c3adee95b into 9345886d44

Fix typo when referencing the `rustc-abi` field.

blog/content/edition-2/posts/02-minimal-rust-kernel/index.fa.md

@@ -197,6 +197,12 @@ rtl = true
 
 For more information, see our post on [disabling SIMD](@/edition-2/posts/02-minimal-rust-kernel/disable-simd/index.md).
 
+```json
+"rustc-abi": "x86-softfloat"
+```
+
+As we want to use the `soft-float` feature, we also need to tell the Rust compiler `rustc` that we want to use the corresponding ABI. We can do that by setting the `rustc-abi` field to `x86-softfloat`.
+
 #### کنار هم قرار دادن
 فایل مشخصات هدف ما اکنون به این شکل است:
 
@@ -214,7 +220,8 @@ For more information, see our post on [disabling SIMD](@/edition-2/posts/02-mini
     "linker": "rust-lld",
     "panic-strategy": "abort",
     "disable-redzone": true,
-    "features": "-mmx,-sse,+soft-float"
+    "features": "-mmx,-sse,+soft-float",
+    "rustc-abi": "x86-softfloat"
 }
 ```
 

blog/content/edition-2/posts/02-minimal-rust-kernel/index.fr.md

@@ -194,6 +194,12 @@ Un problème avec la désactivation de SIMD est que les opérations sur les nomb
 
 Pour plus d'informations, voir notre article sur la [désactivation de SIMD](@/edition-2/posts/02-minimal-rust-kernel/disable-simd/index.md).
 
+```json
+"rustc-abi": "x86-softfloat"
+```
+
+As we want to use the `soft-float` feature, we also need to tell the Rust compiler `rustc` that we want to use the corresponding ABI. We can do that by setting the `rustc-abi` field to `x86-softfloat`.
+
 #### Assembler le tout
 Notre fichier de spécification de cible ressemble maintenant à ceci :
 
@@ -211,7 +217,8 @@ Notre fichier de spécification de cible ressemble maintenant à ceci :
     "linker": "rust-lld",
     "panic-strategy": "abort",
     "disable-redzone": true,
-    "features": "-mmx,-sse,+soft-float"
+    "features": "-mmx,-sse,+soft-float",
+    "rustc-abi": "x86-softfloat"
 }
 ```
 

blog/content/edition-2/posts/02-minimal-rust-kernel/index.ja.md

@@ -191,6 +191,13 @@ SIMDを無効化することによる問題に、`x86_64`における浮動小
 
 より詳しくは、[SIMDを無効化する](@/edition-2/posts/02-minimal-rust-kernel/disable-simd/index.md)ことに関する私達の記事を読んでください。
 
+```json
+"rustc-abi": "x86-softfloat"
+```
+
+As we want to use the `soft-float` feature, we also need to tell the Rust compiler `rustc` that we want to use the corresponding ABI. We can do that by setting the `rustc-abi` field to `x86-softfloat`.
+
+
 #### まとめると
 私達のターゲット仕様ファイルは今このようになっているはずです。
 
@@ -208,7 +215,8 @@ SIMDを無効化することによる問題に、`x86_64`における浮動小
     "linker": "rust-lld",
     "panic-strategy": "abort",
     "disable-redzone": true,
-    "features": "-mmx,-sse,+soft-float"
+    "features": "-mmx,-sse,+soft-float",
+    "rustc-abi": "x86-softfloat"
 }
 ```
 

blog/content/edition-2/posts/02-minimal-rust-kernel/index.ko.md

@@ -202,6 +202,12 @@ SIMD 레지스터 값들을 메모리에 백업하고 또 다시 복구하는
 
 더 자세히 알고 싶으시다면, 저희가 작성한 [SIMD 기능 해제](@/edition-2/posts/02-minimal-rust-kernel/disable-simd/index.ko.md)에 관한 포스트를 확인해주세요.
 
+```json
+"rustc-abi": "x86-softfloat"
+```
+
+As we want to use the `soft-float` feature, we also need to tell the Rust compiler `rustc` that we want to use the corresponding ABI. We can do that by setting the `rustc-abi` field to `x86-softfloat`.
+
 #### 요약
 컴파일 대상 환경 설정 파일을 아래와 같이 작성합니다:
 
@@ -219,7 +225,8 @@ SIMD 레지스터 값들을 메모리에 백업하고 또 다시 복구하는
     "linker": "rust-lld",
     "panic-strategy": "abort",
     "disable-redzone": true,
-    "features": "-mmx,-sse,+soft-float"
+    "features": "-mmx,-sse,+soft-float",
+    "rustc-abi": "x86-softfloat"
 }
 ```
 

blog/content/edition-2/posts/02-minimal-rust-kernel/index.md

@@ -189,6 +189,12 @@ A problem with disabling SIMD is that floating point operations on `x86_64` requ
 
 For more information, see our post on [disabling SIMD](@/edition-2/posts/02-minimal-rust-kernel/disable-simd/index.md).
 
+```json
+"rustc-abi": "x86-softfloat"
+```
+
+As we want to use the `soft-float` feature, we also need to tell the Rust compiler `rustc` that we want to use the corresponding ABI. We can do that by setting the `rustc-abi` field to `x86-softfloat`.
+
 #### Putting it Together
 Our target specification file now looks like this:
 
@@ -206,7 +212,8 @@ Our target specification file now looks like this:
     "linker": "rust-lld",
     "panic-strategy": "abort",
     "disable-redzone": true,
-    "features": "-mmx,-sse,+soft-float"
+    "features": "-mmx,-sse,+soft-float",
+    "rustc-abi": "x86-softfloat"
 }
 ```
 

blog/content/edition-2/posts/02-minimal-rust-kernel/index.ru.md

@@ -194,6 +194,12 @@ Cargo поддерживает различные целевые системы
 
 Для получения дополнительной информации см. наш пост об [отключении SIMD](@/edition-2/posts/02-minimal-rust-kernel/disable-simd/index.ru.md).
 
+```json
+"rustc-abi": "x86-softfloat"
+```
+
+As we want to use the `soft-float` feature, we also need to tell the Rust compiler `rustc` that we want to use the corresponding ABI. We can do that by setting the `rustc-abi` field to `x86-softfloat`.
+
 #### Соединяем все вместе
 
 Наша спецификация целовой платформы выглядит следующим образом:
@@ -212,7 +218,8 @@ Cargo поддерживает различные целевые системы
   "linker": "rust-lld",
   "panic-strategy": "abort",
   "disable-redzone": true,
-  "features": "-mmx,-sse,+soft-float"
+  "features": "-mmx,-sse,+soft-float",
+  "rustc-abi": "x86-softfloat"
 }
 ```
 

blog/content/edition-2/posts/02-minimal-rust-kernel/index.zh-CN.md

@@ -161,6 +161,12 @@ Nightly 版本的编译器允许我们在源码的开头插入**特性标签**
 
 [disabling SIMD]: @/edition-2/posts/02-minimal-rust-kernel/disable-simd/index.zh-CN.md
 
+```json
+"rustc-abi": "x86-softfloat"
+```
+
+As we want to use the `soft-float` feature, we also need to tell the Rust compiler `rustc` that we want to use the corresponding ABI. We can do that by setting the `rustc-abi` field to `x86-softfloat`.
+
 现在，我们将各个配置项整合在一起。我们的目标配置清单应该长这样：
 
 ```json
@@ -177,7 +183,8 @@ Nightly 版本的编译器允许我们在源码的开头插入**特性标签**
     "linker": "rust-lld",
     "panic-strategy": "abort",
     "disable-redzone": true,
-    "features": "-mmx,-sse,+soft-float"
+    "features": "-mmx,-sse,+soft-float",
+    "rustc-abi": "x86-softfloat"
 }
 ```
 

blog/content/edition-2/posts/12-async-await/index.ja.md

@@ -32,7 +32,7 @@ translation_contributors = ["asami-kawasaki", "Foo-x"]
 
 [**マルチタスク**]: https://en.wikipedia.org/wiki/Computer_multitasking
 
-一見、すべてのタスクが並行して実行されているように見えますが、1つのCPUコアで同時に実行できるのは1つのタスクだけです。タスクが並列に実行されているように見せるために、OSは実行中のタスクを素早く切り替えて、それぞれのタスクが少しずつ進むようにしています。コンピュータは高速なので、ほとんどの場合、私達がこの切り替えに気づくことはありません。
+一見、すべてのタスクが並列に実行されているように見えますが、1つのCPUコアで同時に実行できるのは1つのタスクだけです。タスクが並列に実行されているように見せるために、OSは実行中のタスクを素早く切り替えて、それぞれのタスクが少しずつ進むようにしています。コンピュータは高速なので、ほとんどの場合、私達がこの切り替えに気づくことはありません。
 
 シングルコアのCPUは一度に1つのタスクしか実行できませんが、マルチコアのCPUは複数のタスクを真の意味で並列に実行することができます。例えば、8コアのCPUであれば、8つのタスクを同時に実行することができます。マルチコアCPUの設定方法については、今後の記事でご紹介します。この記事では、わかりやすくするために、シングルコアのCPUに焦点を当てます。（なお、マルチコアCPUには、最初は1つのアクティブコアしかないので、ここではシングルコアCPUとして扱っても問題はありません）。
 

scripts/create-book.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# create working dir
+rm -r book/
+mkdir book/
+
+# copy data to working dir
+cat ../blog/content/edition-2/posts/*/index.md > book/book.md
+find ../blog/content/edition-2/posts ! -name "*.md" -exec cp -t book/ {} +
+
+# remove zola metadata
+sed -i '/^+++/,/^+++/d' book/book.md
+# remove br in table in 06, pandoc handles the layout
+sed -i '/<br>/d' book/book.md
+# details/summary breaks epub layout
+sed -i '/^<details>/d' book/book.md
+sed -i '/^<\/details>/d' book/book.md
+sed -i '/^<summary>/d' book/book.md
+
+# special fix for linking to different folder
+sed -i 's|../paging-introduction/||g' book/book.md
+
+# go to work dir and create epub
+cd book/
+pandoc book.md -o "Writing an OS in Rust.epub" --metadata cover-image="../cover.png" --metadata title="Writing an OS in Rust"  --metadata author="Philipp Oppermann" --metadata description="This blog series creates a small operating system in the Rust programming language. Each post is a small tutorial and includes all needed code, so you can follow along if you like. The source code is also available in the corresponding Github repository."
+
+#clean up
+cd ..
+mv "book/Writing an OS in Rust.epub" .
+rm -rf book/