aboutsummaryrefslogtreecommitdiff
path: root/dynasm
diff options
context:
space:
mode:
authorMike Pall <mike>2016-03-03 12:11:37 +0100
committerMike Pall <mike>2016-03-03 12:11:37 +0100
commitf4231949b5e14e1116452f9e9eea31e19a462c82 (patch)
tree8201252fca8a867ea4d1c33736f1a4dbfd77de6b /dynasm
parent6f3eed9fd8d4f666f21d1e15cdf377a71a3925cf (diff)
parentdb1b399af134e715b8ba9a0e4ad9cbafbe06ecb1 (diff)
downloadluajit-f4231949b5e14e1116452f9e9eea31e19a462c82.tar.gz
luajit-f4231949b5e14e1116452f9e9eea31e19a462c82.tar.bz2
luajit-f4231949b5e14e1116452f9e9eea31e19a462c82.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'dynasm')
-rw-r--r--dynasm/dasm_arm.h2
-rw-r--r--dynasm/dasm_arm.lua2
-rw-r--r--dynasm/dasm_arm64.h2
-rw-r--r--dynasm/dasm_arm64.lua2
-rw-r--r--dynasm/dasm_mips.h2
-rw-r--r--dynasm/dasm_mips.lua2
-rw-r--r--dynasm/dasm_ppc.h2
-rw-r--r--dynasm/dasm_ppc.lua2
-rw-r--r--dynasm/dasm_proto.h2
-rw-r--r--dynasm/dasm_x64.lua2
-rw-r--r--dynasm/dasm_x86.h2
-rw-r--r--dynasm/dasm_x86.lua2
-rw-r--r--dynasm/dynasm.lua4
13 files changed, 14 insertions, 14 deletions
diff --git a/dynasm/dasm_arm.h b/dynasm/dasm_arm.h
index 57e0116f..0fa69ac0 100644
--- a/dynasm/dasm_arm.h
+++ b/dynasm/dasm_arm.h
@@ -1,6 +1,6 @@
1/* 1/*
2** DynASM ARM encoding engine. 2** DynASM ARM encoding engine.
3** Copyright (C) 2005-2015 Mike Pall. All rights reserved. 3** Copyright (C) 2005-2016 Mike Pall. All rights reserved.
4** Released under the MIT license. See dynasm.lua for full copyright notice. 4** Released under the MIT license. See dynasm.lua for full copyright notice.
5*/ 5*/
6 6
diff --git a/dynasm/dasm_arm.lua b/dynasm/dasm_arm.lua
index 6a1d1d51..e2ed922a 100644
--- a/dynasm/dasm_arm.lua
+++ b/dynasm/dasm_arm.lua
@@ -1,7 +1,7 @@
1------------------------------------------------------------------------------ 1------------------------------------------------------------------------------
2-- DynASM ARM module. 2-- DynASM ARM module.
3-- 3--
4-- Copyright (C) 2005-2015 Mike Pall. All rights reserved. 4-- Copyright (C) 2005-2016 Mike Pall. All rights reserved.
5-- See dynasm.lua for full copyright notice. 5-- See dynasm.lua for full copyright notice.
6------------------------------------------------------------------------------ 6------------------------------------------------------------------------------
7 7
diff --git a/dynasm/dasm_arm64.h b/dynasm/dasm_arm64.h
index d912e61d..d64e60a3 100644
--- a/dynasm/dasm_arm64.h
+++ b/dynasm/dasm_arm64.h
@@ -1,6 +1,6 @@
1/* 1/*
2** DynASM ARM64 encoding engine. 2** DynASM ARM64 encoding engine.
3** Copyright (C) 2005-2015 Mike Pall. All rights reserved. 3** Copyright (C) 2005-2016 Mike Pall. All rights reserved.
4** Released under the MIT license. See dynasm.lua for full copyright notice. 4** Released under the MIT license. See dynasm.lua for full copyright notice.
5*/ 5*/
6 6
diff --git a/dynasm/dasm_arm64.lua b/dynasm/dasm_arm64.lua
index c1e3a81b..4a7d8dfe 100644
--- a/dynasm/dasm_arm64.lua
+++ b/dynasm/dasm_arm64.lua
@@ -1,7 +1,7 @@
1------------------------------------------------------------------------------ 1------------------------------------------------------------------------------
2-- DynASM ARM64 module. 2-- DynASM ARM64 module.
3-- 3--
4-- Copyright (C) 2005-2015 Mike Pall. All rights reserved. 4-- Copyright (C) 2005-2016 Mike Pall. All rights reserved.
5-- See dynasm.lua for full copyright notice. 5-- See dynasm.lua for full copyright notice.
6------------------------------------------------------------------------------ 6------------------------------------------------------------------------------
7 7
diff --git a/dynasm/dasm_mips.h b/dynasm/dasm_mips.h
index 2f4c2d22..c10528fa 100644
--- a/dynasm/dasm_mips.h
+++ b/dynasm/dasm_mips.h
@@ -1,6 +1,6 @@
1/* 1/*
2** DynASM MIPS encoding engine. 2** DynASM MIPS encoding engine.
3** Copyright (C) 2005-2015 Mike Pall. All rights reserved. 3** Copyright (C) 2005-2016 Mike Pall. All rights reserved.
4** Released under the MIT license. See dynasm.lua for full copyright notice. 4** Released under the MIT license. See dynasm.lua for full copyright notice.
5*/ 5*/
6 6
diff --git a/dynasm/dasm_mips.lua b/dynasm/dasm_mips.lua
index ef383431..c5a5595c 100644
--- a/dynasm/dasm_mips.lua
+++ b/dynasm/dasm_mips.lua
@@ -1,7 +1,7 @@
1------------------------------------------------------------------------------ 1------------------------------------------------------------------------------
2-- DynASM MIPS module. 2-- DynASM MIPS module.
3-- 3--
4-- Copyright (C) 2005-2015 Mike Pall. All rights reserved. 4-- Copyright (C) 2005-2016 Mike Pall. All rights reserved.
5-- See dynasm.lua for full copyright notice. 5-- See dynasm.lua for full copyright notice.
6------------------------------------------------------------------------------ 6------------------------------------------------------------------------------
7 7
diff --git a/dynasm/dasm_ppc.h b/dynasm/dasm_ppc.h
index 332c64dc..3f267fb8 100644
--- a/dynasm/dasm_ppc.h
+++ b/dynasm/dasm_ppc.h
@@ -1,6 +1,6 @@
1/* 1/*
2** DynASM PPC/PPC64 encoding engine. 2** DynASM PPC/PPC64 encoding engine.
3** Copyright (C) 2005-2015 Mike Pall. All rights reserved. 3** Copyright (C) 2005-2016 Mike Pall. All rights reserved.
4** Released under the MIT license. See dynasm.lua for full copyright notice. 4** Released under the MIT license. See dynasm.lua for full copyright notice.
5*/ 5*/
6 6
diff --git a/dynasm/dasm_ppc.lua b/dynasm/dasm_ppc.lua
index 1e9bccae..e2f704ec 100644
--- a/dynasm/dasm_ppc.lua
+++ b/dynasm/dasm_ppc.lua
@@ -1,7 +1,7 @@
1------------------------------------------------------------------------------ 1------------------------------------------------------------------------------
2-- DynASM PPC/PPC64 module. 2-- DynASM PPC/PPC64 module.
3-- 3--
4-- Copyright (C) 2005-2015 Mike Pall. All rights reserved. 4-- Copyright (C) 2005-2016 Mike Pall. All rights reserved.
5-- See dynasm.lua for full copyright notice. 5-- See dynasm.lua for full copyright notice.
6-- 6--
7-- Support for various extensions contributed by Caio Souza Oliveira. 7-- Support for various extensions contributed by Caio Souza Oliveira.
diff --git a/dynasm/dasm_proto.h b/dynasm/dasm_proto.h
index 93ca0653..22a654cb 100644
--- a/dynasm/dasm_proto.h
+++ b/dynasm/dasm_proto.h
@@ -1,6 +1,6 @@
1/* 1/*
2** DynASM encoding engine prototypes. 2** DynASM encoding engine prototypes.
3** Copyright (C) 2005-2015 Mike Pall. All rights reserved. 3** Copyright (C) 2005-2016 Mike Pall. All rights reserved.
4** Released under the MIT license. See dynasm.lua for full copyright notice. 4** Released under the MIT license. See dynasm.lua for full copyright notice.
5*/ 5*/
6 6
diff --git a/dynasm/dasm_x64.lua b/dynasm/dasm_x64.lua
index b1b62022..21333556 100644
--- a/dynasm/dasm_x64.lua
+++ b/dynasm/dasm_x64.lua
@@ -1,7 +1,7 @@
1------------------------------------------------------------------------------ 1------------------------------------------------------------------------------
2-- DynASM x64 module. 2-- DynASM x64 module.
3-- 3--
4-- Copyright (C) 2005-2015 Mike Pall. All rights reserved. 4-- Copyright (C) 2005-2016 Mike Pall. All rights reserved.
5-- See dynasm.lua for full copyright notice. 5-- See dynasm.lua for full copyright notice.
6------------------------------------------------------------------------------ 6------------------------------------------------------------------------------
7-- This module just sets 64 bit mode for the combined x86/x64 module. 7-- This module just sets 64 bit mode for the combined x86/x64 module.
diff --git a/dynasm/dasm_x86.h b/dynasm/dasm_x86.h
index be9c289f..bf5b7296 100644
--- a/dynasm/dasm_x86.h
+++ b/dynasm/dasm_x86.h
@@ -1,6 +1,6 @@
1/* 1/*
2** DynASM x86 encoding engine. 2** DynASM x86 encoding engine.
3** Copyright (C) 2005-2015 Mike Pall. All rights reserved. 3** Copyright (C) 2005-2016 Mike Pall. All rights reserved.
4** Released under the MIT license. See dynasm.lua for full copyright notice. 4** Released under the MIT license. See dynasm.lua for full copyright notice.
5*/ 5*/
6 6
diff --git a/dynasm/dasm_x86.lua b/dynasm/dasm_x86.lua
index 60f5211a..1f21a267 100644
--- a/dynasm/dasm_x86.lua
+++ b/dynasm/dasm_x86.lua
@@ -1,7 +1,7 @@
1------------------------------------------------------------------------------ 1------------------------------------------------------------------------------
2-- DynASM x86/x64 module. 2-- DynASM x86/x64 module.
3-- 3--
4-- Copyright (C) 2005-2015 Mike Pall. All rights reserved. 4-- Copyright (C) 2005-2016 Mike Pall. All rights reserved.
5-- See dynasm.lua for full copyright notice. 5-- See dynasm.lua for full copyright notice.
6------------------------------------------------------------------------------ 6------------------------------------------------------------------------------
7 7
diff --git a/dynasm/dynasm.lua b/dynasm/dynasm.lua
index 145fb0cc..1e5899a4 100644
--- a/dynasm/dynasm.lua
+++ b/dynasm/dynasm.lua
@@ -2,7 +2,7 @@
2-- DynASM. A dynamic assembler for code generation engines. 2-- DynASM. A dynamic assembler for code generation engines.
3-- Originally designed and implemented for LuaJIT. 3-- Originally designed and implemented for LuaJIT.
4-- 4--
5-- Copyright (C) 2005-2015 Mike Pall. All rights reserved. 5-- Copyright (C) 2005-2016 Mike Pall. All rights reserved.
6-- See below for full copyright notice. 6-- See below for full copyright notice.
7------------------------------------------------------------------------------ 7------------------------------------------------------------------------------
8 8
@@ -17,7 +17,7 @@ local _info = {
17 url = "http://luajit.org/dynasm.html", 17 url = "http://luajit.org/dynasm.html",
18 license = "MIT", 18 license = "MIT",
19 copyright = [[ 19 copyright = [[
20Copyright (C) 2005-2015 Mike Pall. All rights reserved. 20Copyright (C) 2005-2016 Mike Pall. All rights reserved.
21 21
22Permission is hereby granted, free of charge, to any person obtaining 22Permission is hereby granted, free of charge, to any person obtaining
23a copy of this software and associated documentation files (the 23a copy of this software and associated documentation files (the
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-01-21 15:25:47 +0000