Skip to content

Commit 85d6714

Browse files
bettiobettio
committed
Forward port changes from v0.6 release branch
Merge into main from release-0.6 branch: - minor cleanups in opcodesswitch.h (such as PRs: #1712, #1713, #1714, #1715, etc...) - switch to new atomvm.org domain (such as PRs: #1698, #1711, etc...)
2 parents 542d36b + 55c4290 commit 85d6714

File tree

11 files changed

+29
-31
lines changed

11 files changed

+29
-31
lines changed

‎.github/workflows/build-docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
55
#
66
# This is a workflow for atomvm/AtomVM to Publish API documentation and other content from the `doc` directory to
7-
# atomvm.net hosted on GitHub Pages
7+
# doc.atomvm.org hosted on GitHub Pages
88

99
name: Build Docs
1010

‎.github/workflows/publish-docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
55
#
66
# This is a workflow for atomvm/AtomVM to Publish API documentation and other content from the `doc` directory to
7-
# atomvm.net hosted on GitHub Pages
7+
# doc.atomvm.org hosted on GitHub Pages
88

99
name: Publish Docs
1010

‎README.Md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ Getting Started
2828
===============
2929
There is much more information, including a more complete
3030
["Getting Started Guide"](https://doc.atomvm.org/main/getting-started-guide.html),
31-
[examples](https://www.atomvm.net/sample-code),
31+
[examples](https://atomvm.org/sample-code),
3232
detailed [build instructions](https://doc.atomvm.org/main/build-instructions.html),
33-
and [contact information](https://www.atomvm.net/contact) available on the
34-
[AtomVM](https://atomvm.net) project website.
33+
and [contact information](https://atomvm.org/contact) available on the
34+
[AtomVM](https://atomvm.org) project website.
3535

3636
>Don't forget to check out the [examples repository](https://github.com/atomvm/atomvm_examples) to
3737
>help get you started on your next IoT project.

‎doc/release-notes.md.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright 2023 AtomVM <atomvm.net>
2+
Copyright 2023 AtomVM <atomvm.org>
33

44
SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
55
-->

‎doc/src/programmers-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2408,7 +2408,7 @@ Currently, the `net:getaddrinfo/1,2` functions only supports reporting of IPv4 a
24082408
For example:
24092409

24102410
```erlang
2411-
{ok, AddrInfos} = net:getaddrinfo("www.atomvm.net"),
2411+
{ok, AddrInfos} = net:getaddrinfo("atomvm.org"),
24122412

24132413
lists:foreach(
24142414
fun(AddrInfo) ->
@@ -2447,7 +2447,7 @@ with OTP 22 ff., AtomVM supports both the `address` and `addr` keys in this map
24472447
If you want to narrow the information you get back to a specific service type, you can specify a service name or port number (as a string value) as the second parameter:
24482448

24492449
```erlang
2450-
{ok, AddrInfos} = net:getaddrinfo("www.atomvm.net", "https"),
2450+
{ok, AddrInfos} = net:getaddrinfo("atomvm.org", "https"),
24512451
...
24522452
```
24532453

‎examples/erlang/http_client.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
start() ->
2727
ssl:start(),
28-
ConnectResult = ahttp_client:connect(https, "atomvm.net", 443, [
28+
ConnectResult = ahttp_client:connect(https, "test.atomvm.org", 443, [
2929
{active, ?ACTIVE}, {verify, verify_none}, {parse_headers, [<<"Location">>]}
3030
]),
3131
case ConnectResult of

‎src/libAtomVM/opcodesswitch.h

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3350,7 +3350,7 @@ HOT_FUNC int scheduler_entry_point(GlobalContext *glb)
33503350
#endif
33513351

33523352
#ifdef IMPL_EXECUTE_LOOP
3353-
if (LIKELY(term_is_tuple(src_value))) {
3353+
assert(term_is_tuple(src_value));
33543354
int arity = term_get_tuple_arity(src_value);
33553355
#endif
33563356

@@ -3370,9 +3370,6 @@ HOT_FUNC int scheduler_entry_point(GlobalContext *glb)
33703370
}
33713371
#endif
33723372
}
3373-
#ifdef IMPL_EXECUTE_LOOP
3374-
}
3375-
#endif
33763373

33773374
#ifdef IMPL_EXECUTE_LOOP
33783375
if (!jump_to_address) {
@@ -5562,7 +5559,7 @@ HOT_FUNC int scheduler_entry_point(GlobalContext *glb)
55625559
#endif
55635560

55645561
#ifdef IMPL_CODE_LOADER
5565-
TRACE("is_function/3\n");
5562+
TRACE("is_function2/3\n");
55665563
UNUSED(label)
55675564
UNUSED(arg1)
55685565
#endif
@@ -6145,7 +6142,6 @@ HOT_FUNC int scheduler_entry_point(GlobalContext *glb)
61456142
#ifdef IMPL_EXECUTE_LOOP
61466143
TRACE("fmove/2 fp%i, %c%i\n", freg, T_DEST_REG(dreg));
61476144
// Space should be available on heap as compiler added an allocate opcode
6148-
context_ensure_fpregs(ctx);
61496145
term float_value = term_from_float(ctx->fr[freg], &ctx->heap);
61506146
WRITE_REGISTER(dreg, float_value);
61516147
#endif
@@ -6210,7 +6206,6 @@ HOT_FUNC int scheduler_entry_point(GlobalContext *glb)
62106206
#ifdef HAVE_PRAGMA_STDC_FENV_ACCESS
62116207
feclearexcept(FE_OVERFLOW);
62126208
#endif
6213-
context_ensure_fpregs(ctx);
62146209
ctx->fr[freg3] = ctx->fr[freg1] + ctx->fr[freg2];
62156210
#ifdef HAVE_PRAGMA_STDC_FENV_ACCESS
62166211
if (fetestexcept(FE_OVERFLOW)) {
@@ -6257,7 +6252,6 @@ HOT_FUNC int scheduler_entry_point(GlobalContext *glb)
62576252
#ifdef HAVE_PRAGMA_STDC_FENV_ACCESS
62586253
feclearexcept(FE_OVERFLOW);
62596254
#endif
6260-
context_ensure_fpregs(ctx);
62616255
ctx->fr[freg3] = ctx->fr[freg1] - ctx->fr[freg2];
62626256
#ifdef HAVE_PRAGMA_STDC_FENV_ACCESS
62636257
if (fetestexcept(FE_OVERFLOW)) {
@@ -6304,7 +6298,6 @@ HOT_FUNC int scheduler_entry_point(GlobalContext *glb)
63046298
#ifdef HAVE_PRAGMA_STDC_FENV_ACCESS
63056299
feclearexcept(FE_OVERFLOW);
63066300
#endif
6307-
context_ensure_fpregs(ctx);
63086301
ctx->fr[freg3] = ctx->fr[freg1] * ctx->fr[freg2];
63096302
#ifdef HAVE_PRAGMA_STDC_FENV_ACCESS
63106303
if (fetestexcept(FE_OVERFLOW)) {
@@ -6351,7 +6344,6 @@ HOT_FUNC int scheduler_entry_point(GlobalContext *glb)
63516344
#ifdef HAVE_PRAGMA_STDC_FENV_ACCESS
63526345
feclearexcept(FE_OVERFLOW | FE_DIVBYZERO);
63536346
#endif
6354-
context_ensure_fpregs(ctx);
63556347
ctx->fr[freg3] = ctx->fr[freg1] / ctx->fr[freg2];
63566348
#ifdef HAVE_PRAGMA_STDC_FENV_ACCESS
63576349
if (fetestexcept(FE_OVERFLOW | FE_DIVBYZERO)) {
@@ -6924,6 +6916,12 @@ HOT_FUNC int scheduler_entry_point(GlobalContext *glb)
69246916
}
69256917

69266918
case OP_CALL_FUN2: {
6919+
#ifdef IMPL_EXECUTE_LOOP
6920+
remaining_reductions--;
6921+
if (UNLIKELY(!remaining_reductions)) {
6922+
SCHEDULE_NEXT(mod, pc - 1);
6923+
}
6924+
#endif
69276925
term tag;
69286926
DECODE_COMPACT_TERM(tag, pc)
69296927
unsigned int args_count;

‎src/platforms/esp32/test/main/test_erl_sources/test_ssl.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ start() ->
5050
ok = send_loop(
5151
SSLContext,
5252
Socket,
53-
<<"GET / HTTP/1.1\r\nHost: atomvm.net\r\nUser-Agent: AtomVM within qemu\r\n\r\n">>
53+
<<"GET / HTTP/1.1\r\nHost: test.atomvm.org\r\nUser-Agent: AtomVM within qemu\r\n\r\n">>
5454
),
5555
% Read
5656
{ok, <<"HTTP/1.1">>} = recv_loop(SSLContext, Socket, 8, []),

‎tests/libs/eavmlib/test_ahttp_client.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ test() ->
2727

2828
test_passive() ->
2929
ok = ssl:start(),
30-
ConnectResult = ahttp_client:connect(https, "www.atomvm.net", 443, [
30+
ConnectResult = ahttp_client:connect(https, "test.atomvm.org", 443, [
3131
{active, false}, {verify, verify_none}, {parse_headers, [<<"Location">>]}
3232
]),
3333
case ConnectResult of
@@ -47,7 +47,7 @@ test_passive() ->
4747
ok.
4848

4949
test_active() ->
50-
ConnectResult = ahttp_client:connect(http, "www.atomvm.net", 80, [{active, true}]),
50+
ConnectResult = ahttp_client:connect(http, "test.atomvm.org", 80, [{active, true}]),
5151
case ConnectResult of
5252
{ok, Conn} ->
5353
case ahttp_client:request(Conn, <<"GET">>, <<"/">>, [], undefined) of

‎tests/libs/estdlib/test_net.erl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ test() ->
2929
ok.
3030

3131
test_getaddrinfo() ->
32-
ok = test_getaddrinfo("www.atomvm.net"),
32+
ok = test_getaddrinfo("test.atomvm.org"),
3333
ok.
3434

3535
test_getaddrinfo(Host) ->
@@ -70,8 +70,8 @@ test_getaddrinfo(Host) ->
7070
ok.
7171

7272
test_getaddrinfo2() ->
73-
ok = test_getaddrinfo2("www.atomvm.net", "https"),
74-
ok = test_getaddrinfo2("www.atomvm.net", "443"),
73+
ok = test_getaddrinfo2("test.atomvm.org", "https"),
74+
ok = test_getaddrinfo2("test.atomvm.org", "443"),
7575
ok = test_getaddrinfo2(undefined, "443"),
7676
ok.
7777

0 commit comments

Comments
 (0)